-updated to integrate jacinta's view
Merge branch 'master' of https://github.com/rkstedman/healthhack

Conflicts:
	lib/views/patient-entry-1.jade
	lib/views/patient-entry-2.jade
Merge branch 'master' of https://github.com/rkstedman/healthhack