Started switching over to the game's map
merged conflicts
Merge branch 'master' of https://github.com/Tadimsky/vooga into Level-Editor
unified the map
Merge branch 'Level-Editor' of https://github.com/Tadimsky/vooga into Level-Editor