almost done
Merge branch 'master' of https://github.com/aldenquimby/cs4733

Conflicts:
	hw3/hw3_team18.m