#3
Merge branch 'master' of github.com:nicam/webnesday

Conflicts:
	app/partials/home.html