hw04
Merge branch 'master' of https://github.com/tkicks/comp398

Conflicts:
	hw01