Merge pull request #1 from thelock12/master

Pull
Merge pull request #2 from thelock12/master

Repile
Merge pull request #4 from Anuruth/master

add Taxi class