fixing up confilicts
Merge branch 'master' of github.com:jks8787/MeHungryNow