small changes
Merge branch 'master' of git@github.com:teamGaia/OneDrinkAway.git