final commit before play store
Merge branch 'master' of https://github.com/calren/EatNow