all style finished
Merge branch 'master' of github.com:Ewarren7/Yelp