resolved conflict with application.css
Merge branch 'master' of github.com:jks8787/MeHungryNow