ALL THE TYPES OF STUFF
Merge branch 'master' of github.com:nddrylliog/johnqadamant