hw7 finished
Merge branch 'master' of https://github.com/curtismuntz/machine_vision

Conflicts:
	hw7/hw7.m