I can't pull because I have a conflict with project.properties. To fix,
I'm trying to commit an exact copy of the file from Git Hub
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/project.properties