edits to show
Merge branch 'master' of https://github.com/TaxiRating/Server