Resolve merge conflict by keeping the move of the javascript code from comments.js to responses.js.
Resolve merge conflict by keeping the move of the javascript code from comments.js to responses.js.

great-horned-owls-2014/dbc-what-is-this,great-horned-owls-2014/dbc-what-is-this