stuff for part B
Merge branch 'master' of github.com:knitHacker/w4118

Conflicts:
	hw4/test/test.c