Add security and error messages
Merge branch 'master' of https://github.com/bhc24/EECS_393_Project

Conflicts:
	pamlla/templates/Patient_History.html
	pamlla/templates/index.html