conflict staging
Merge branch '0.1' of https://github.com/cberizko/BlockyRogue into 0.1
fixed up some things + crazy merge skills.