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

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/fitFact/fitFact