commiting changes before checkout
Merge branch 'master' of https://github.com/kronion/DishCrown
Fixing stars
some changes to menu.jade
resolved menu.jade conflict
some more style changes
other style changes