CSS
Merge branch 'master' of https://github.com/drappier-charles/jshero

Conflicts:
	app/styles/main.css
	app/views/main.html