fixed shit
Merge branch 'master' of https://github.com/kylelin47/COP-Project
Merge branch 'master' of https://github.com/kylelin47/COP-Project
redone things