Fixes to commenting_spec
Fixed merge conflicts in question show page
SO MUCH STYLING