h
Merge branch 'master' of https://github.com/makenai/heroschool-app

Conflicts:
	www/index.html
	www/stylesheets/application.css