first commit
Merge https://github.com/developerc/taxidriver_3