commit
Merge branch 'master' of https://github.com/AtsOutOfScope/bugfree-octo-happiness

Conflicts:
	www/index.html
	www/js/app.js