Level Merge

Fixed Level after GIT merged poorly
Merge branch 'development' of https://github.com/Thisita/UniRogue into development