Merge branch 'characters'
Merge branch 'master' of https://github.com/Caffinium/ToKillTheBlindGod