commit
commit classpath
User button on home page works, but displays no useful data

Contact classes are present. I added a comment to each class
Merge remote-tracking branch 'Drew/master'

Conflicts:
	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/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Drew/master'

Conflicts:
	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/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Added page to add fire apparatus to DB
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
commit
Added RPC to let users add fire apparatus to DB
Added class to view fire apparatus

Added functionality to delete entries from fire apparatus table
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
Removed SQL injection issue
Added refresh and back buttons to apparatus stuff
Merge remote-tracking branch 'Jake/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/.classpath
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Fixed login view to have colored buttons
Merge remote-tracking branch 'Josh/master'
here you go