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

Conflicts:
	TeamPlaceHolderGame/Assembly-CSharp-vs.csproj
	TeamPlaceHolderGame/Assembly-UnityScript-vs.unityproj
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
level edits. Jaron we've got two levels that are "Done" nick and I just have to add handrails and other touches, that hopefully won't affect what you have to do