patient.jsp
fixes
Merge branch 'master' of https://github.com/kent-ma/ece356

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
idk
Merge branch 'master' of https://github.com/kent-ma/ece356