m
to merge
to merge
finished derby sql methods
here
Merge remote-tracking branch 'origin/master'

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetCalendarController.java
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetContactInfoController.java
	ycp-cs320-project-persistence/derby.log
	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/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusDetailsView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ContactInfoService.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ContactInfoServiceAsync.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/ContactInfoServiceImpl.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java