update to classpath?
merged 4/10
more database stuff
Merge remote-tracking branch 'Alana/master'

Conflicts:
	BuzzMateApp/AndroidManifest.xml
	BuzzMateApp/src/edu/ycp/cs/cs496/buzzmateapp/MobileApplicationClient.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/IDatabase.java
Drunk Game Finished