renamed a few things, removed unused code
Merge branch 'master' of https://github.com/HJohnson-/Kingtaker