a lot of stuff
Merge branch 'master' of https://github.com/J-shaw1/BrumHack