stupid bug
Merge branch 'mod' of https://github.com/jcambre/CS247-P4 into mod