edge detection added
Merge branch 'master' of https://github.com/hitchdiddy/LaneDetection

Conflicts:
	MainGui.py