Pull iosu's version
Fix conflicts
Merge branch 'master' of https://github.com/Jeronics/get-in-sports-car

Merge
Merge branch 'master' of https://github.com/Jeronics/get-in-sports-car

Merge
commit changes
commit changes