Fixed merge conflict
Resolved merge conflict
Merge branch 'master' of github.com:Dragonborns/christmas-hero
Merge remote-tracking branch 'origin/master'
Implementing level loader (added support for brushes).
Removed DragonGame.getCompundPath stub.