fix .classpath
Added a contact info view and more to the main page
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
preference
Merge remote-tracking branch 'Jake/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetApparatusController.java
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/FormView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
updated stuff
Merge remote-tracking branch 'choose_remote_name/master'
Home page changes added
created ycp-cs320-project-persistence project (for database)
move unit tests to new project, move FakeDatabase to persistence project
started implementation of DerbyDatabase
updated medical forms in FormView class
Merge remote-tracking branch 'josh/master'