penultimate commit
Merge branch 'master' of https://github.com/gyu23/BaeCaughtMeSlippin

Fixed some stuff