gitignore fix
Added tests
merge
Merge branch 'master' of github.com:netman92/carRental