Styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/partials/home.html
	app/partials/home.jade
Styles