commit for merge
Merge branch 'master' of https://github.com/guymorita/hatch

Conflicts:
	www/js/app.js
WIP tutorial, creating new branch
location
commit for presentation
redirect to login