Humao
Merge branch 'master' of https://github.com/creamboy/CS450

Conflicts:
	hw3_4.py