prebranch
Loader Update
Merge branch 'master' of https://github.com/dacroucher/RogueFeature
Making a mess
Merged?