NEW INTERFACE YAY
deleted image icons included
Merge remote-tracking branch 'Alana/master'

Conflicts:
	BuzzMateApp/foodicon-web.png
	BuzzMateApp/res/drawable-hdpi/foodicon.png
	BuzzMateApp/res/drawable-hdpi/ic_launcher.png
	BuzzMateApp/res/drawable-hdpi/soberbuddies.png
	BuzzMateApp/res/drawable-mdpi/foodicon.png
	BuzzMateApp/res/drawable-mdpi/ic_launcher.png
	BuzzMateApp/res/drawable-mdpi/soberbuddies.png
	BuzzMateApp/res/drawable-xhdpi/foodicon.png
	BuzzMateApp/res/drawable-xhdpi/ic_launcher.png
	BuzzMateApp/res/drawable-xhdpi/soberbuddies.png
	BuzzMateApp/res/drawable-xxhdpi/foodicon.png
	BuzzMateApp/res/drawable-xxhdpi/ic_launcher.png
	BuzzMateApp/res/drawable-xxhdpi/soberbuddies.png
	BuzzMateApp/res/layout/activity_main.xml
	BuzzMateApp/src/edu/ycp/cs/cs496/buzzmateapp/MobileApplicationClient.java
	BuzzMateWebService/derby.log
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/controllers/GetLocation.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/CreateInitialData.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/DerbyDatabase.java
	BuzzMateWebService/src/edu/ycp/cs/cs496/locations/model/persist/IDatabase.java