note from mike
Merge branch 'master' of https://github.com/graysky/brad-moving

Conflicts:
	app/templates/home.hbs