level of the room
Merge branch 'master' of github.com:dpek/cs354s-teleport-man

Conflicts:
	Assets/-tk2d.asset
	Assets/Sprites/Actors/PlayerSpriteCollection Data/PlayerSpriteCollection.prefab
	Assets/Sprites/Map/MapSpriteCollection Data/MapSpriteCollection.prefab
Merge branch 'master' of github.com:dpek/cs354s-teleport-man