location TBD
make title consistent
Merge branch 'master' into gh-pages

Conflicts:
	app/views/layouts/application.html.erb
set up custom domain