foo
Merge branch 'master' of github.com:mark33/este

Conflicts:
	app/client/js/react/pages/home.coffee
new page and html