Merge branch 'master' of https://github.com/herp-a-derp/Corruption-of-Champions
Updates broke too much stuff, rolling back the master until I get it working.

This reverts commit 393b04a9a1566062e76396e44837d30157863a32.