Updated NewMapTest

asgpdnspdfa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scenes/NewMapTest.unity
attempting to resolve