commit
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
Merge remote-tracking branch 'Alana/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	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
commit
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	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/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/Ycp_cs320_project_ui.css
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/derby.log
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/CreateInitialData.java
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
Got the database methods working for fire Apparatus spec
Made some minor changes to the apparatus view
so I can merge
Merge remote-tracking branch 'josh/master'
WEB SERVICE WORKS! (for drew)
Merge remote-tracking branch 'Drew/master'