Everything works
mymess
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/partials/home.jade
	app/scripts/controllers/home.js