Changes
Merge branch 'master' of https://github.com/Mordequess/CS247_Project