zwischen commit for merge
GUI gefixed

Merge branch 'master' of
https://olerichter@github.com/hitchdiddy/LaneDetection.git

Conflicts:
	MainGui.py