Oh God why
Merge branch 'master' of https://github.com/GlassActionHeroes/ClashOfTheCoders