switching computers..
pushing tutorial
Merge branch 'master' of https://github.com/guymorita/hatch into hammer

Conflicts:
	www/css/index.css
	www/js/app.js
	www/js/controllers.js