Working on the door
Merge branch 'master' of github.com:etinlb/TiledPlatformer

Conflicts:
	map.json
Stairs and doors
Merge branch 'master' of github.com:etinlb/TiledPlatformer