final edit
Merge branch 'master' of https://github.com/haeusser/carrera

Conflicts:
	main.py