tmx map now works
correct the map
conflict solved
Merge branch 'master' of https://github.com/JoschkaSchulz/psychicGame