Added Chris' changes
Merge branch 'master' of github.com:dpek/cs354s-teleport-man

Conflicts:
	Assets/-tk2d.asset
	Assets/Scenes/Levels/Level0.1.unity
	Assets/Sprites/Actors/soldier-gun-stand-n.png
	Assets/Sprites/Map/Assets Data/Assets.prefab
	Assets/Sprites/Map/AssetsTank Data/atlas0.png
	Assets/Sprites/Map/MapSpriteCollection2 Data/MapSpriteCollection2.prefab