Fixing and adding tons of stuff
Merge branch 'master' of https://github.com/noneabove1182/comp2406