touch up
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assets/Scenes/SpencerTestLevel.unity
started my second level
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder