getting rid of player
adding the robot player
Merge branch 'origin/develop'
Started plane scene.
* re attempt to commit.
* Added Sauve's files.
best room ever
Local commit
Got the best room ever
jmw5yhfghb
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
Imported "jakstuff" package.
Hooked up "Simple WASD_MouseLook" to a character in Dan's level.
Added font folder with TR2N font.
Added drone texture.
* updating plane scene.
no message
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Conflicts:
	tojam/Assembly-CSharp-Editor-vs.csproj
	tojam/Assembly-CSharp-Editor.csproj
	tojam/Assembly-CSharp-Editor.pidb
	tojam/Assembly-CSharp-firstpass-vs.csproj
	tojam/Assembly-CSharp-firstpass.csproj
	tojam/Assembly-CSharp-firstpass.pidb
	tojam/Assembly-CSharp.pidb
	tojam/Assembly-UnityScript-vs.unityproj
	tojam/Assembly-UnityScript.pidb
	tojam/Assembly-UnityScript.unityproj
	tojam/Assets/Textures/lineGlow.png.meta
	tojam/tojam.userprefs
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
room with ramp
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Conflicts:
	tojam/Assembly-CSharp-Editor-vs.csproj
	tojam/Assembly-CSharp-Editor.csproj
	tojam/Assembly-CSharp-Editor.pidb
	tojam/Assembly-CSharp-firstpass-vs.csproj
	tojam/Assembly-CSharp-firstpass.csproj
	tojam/Assembly-CSharp-firstpass.pidb
	tojam/Assembly-CSharp.pidb
	tojam/Assembly-UnityScript-vs.unityproj
	tojam/Assembly-UnityScript.pidb
	tojam/Assembly-UnityScript.unityproj
	tojam/Assets/DestructibleWall/BrickBase.prefab
	tojam/Assets/IK/Materials/blue.mat
	tojam/Assets/IK/Materials/red.mat
	tojam/Assets/Prefabs/player.prefab