getting a pull
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assets/static object Models/double_sided_stairs.fbx.meta
character bug fixes. better gravity/jumping. spencer test level is have done
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
	TeamPlaceHolderGame/TeamPlaceHolderGame.userprefs
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assets/Scenes/SpencerTestLevel.unity