-added form page /form
Merge branch 'master' of https://github.com/rkstedman/healthhack

Conflicts:
	lib/app.js
	lib/routes/index.js
	lib/views/layout.jade
-included form in new app routes file