Comment Styling
Merge branch 'master' of https://github.com/fitFact/fitFact

Conflicts:
	app/assets/stylesheets/news.css.scss
	app/assets/stylesheets/studies.css.scss
	app/views/article/show.html.haml