Merge branch 'master' of https://github.com/chris-skud/mad-parking

Conflicts:
	main.pyc