Fixed some derps
Merge branch 'master' of https://github.com/Team4939/Pangaea_Working