Brandon's commit broke a lot of things for me

So I went ahead and un-did it.
Merge branch 'master' of https://github.com/Cobrabb/Rougelike