Merge branch 'homepage/styling' of https://github.com/sgtonkin/greenfield into homepage/styling

Conflicts:
	client/app/home/home.html
	client/app/home/home.js