layout almost done, background color added. Need to fix soberbuddies
icon
fixed sober buddies icon
Merge remote-tracking branch 'Alana/master'

Conflicts:
	BuzzMateApp/res/layout/activity_main.xml
	BuzzMateApp/src/edu/ycp/cs/cs496/buzzmateapp/MobileApplicationClient.java