throwing together a test scene
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
shhhh theres nothing here
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
death respawning happens. still instant and not pretty, we'll fix that in the future
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.userprefs