merged style changes
Merge branch 'master' of https://github.com/kronion/DishCrown into frontend
style changes