LOTS DONE
Merge branch 'master' of https://github.com/DylanGoodman/4msob1