Got the most updated version
Updated ALOT OF FILES
Making more changes
Merge remote-tracking branch 'Drew/master'
here
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Josh/master'
Merge remote-tracking branch 'Drew/master'
pulled from Drew
Having the ability to login
final work done as of 11:53 AM on 4/19/2013
tidying, no real changes
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
fixed some ui bugs
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
added addfireApparatusSpec support