Tentiatively finished, pushing for merge
Merge branch 'UC63-InProgress' of
https://github.com/knusbaum/CS427-Final.git into UC63-InProgress

Conflicts:
	WebRoot/auth/hcp-uap/addObstetricsInfo.jsp