no message
Merge branch 'master' of https://github.com/OliverArthur/chefApp

Conflicts:
	app/scripts/controllers/about.js
	app/scripts/controllers/main.js
	app/views/about.html
	app/views/main.html