Made small, unsuccessful changes to HomePage's layout XML. I need to
commit before pulling because I'm getting an error.
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/res/layout/activity_home_page.xml