more ending changes
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assets/Prefabs/PlayerPrefab.prefab