About to merge
Merge branch 'master' of https://github.com/anthonyjchriste/683f13

Conflicts:
	CannyEdgeDetector/.idea/workspace.xml
Writing files to disk