to merge
merging
can add medical forms via FormView
Medical forms work 

Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/RPC.java
	ycp-cs320-project-ui/war/WEB-INF/web.xml
	ycp-cs320-project-ui/war/Ycp_cs320_project_ui.css
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java