test commit
what am i doing
version 1
Fixed erroneous comment that might confuse people
Merge branch 'glen' of github.com:leejustin/CS118_2 into glen

Conflicts:
	djp.h