merge commit
Merge branch 'master' of github.com:rushka/ride_the_city