fixed broken stuff
Merge branch 'mod' of github.com:jcambre/CS247-P4 into mod