Merge branch 'master' of https://github.com/JKobyP/misc-projects

I don't know what i'm doing