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

Conflicts:
	app/views/studies/show.html.haml