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

Conflicts:
	ycp-cs320-project-controllers/src/edu/ycp/cs320/controllers/GetApparatusController.java
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/AddApparatusPageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusDetailsView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusService.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/ApparatusServiceAsync.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/server/ApparatusServiceImpl.java
	ycp-cs320-project-ui/war/Ycp_cs320_project_ui.css
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java