Got basic tilemap working (currently wrong positions)
Got cave map to show up and work with the capsule. Although z-axis of camera needs to be -1 for some reason. The tmx file of Arena is different from the png, that's why we were having problems yesterday
didn't save scenes before...
Renamed PlayerMovement to PlayerMovementPaul. This might fix the merge issues
adding some more files?
fixed the conflicts maybe
Merge branch 'paul/tilemap'