realtime patient to admin updates
Merge branch 'master' of https://github.com/TerpsHealthHack/healthhack

Conflicts:
	app.js
fixedeverything