Fixes
Merge branch 'Matt-dev' of github.com:RedGhost/Drexel-CS550 into Matt-dev
Fixes