Merge remote-tracking branch 'origin/Mike'

Conflicts:
	Golden_Dorks/Assets/Scenes/LevelTest01.unity
	Golden_Dorks/Golden_Dorks-csharp.sln
	Golden_Dorks/Golden_Dorks.sln
	Golden_Dorks/Golden_Dorks.userprefs
	Golden_Dorks/Library/CurrentLayout.dwlt
	Golden_Dorks/Library/CurrentMaximizeLayout.dwlt
	Golden_Dorks/Library/ScriptAssemblies/Assembly-CSharp.dll
	Golden_Dorks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Golden_Dorks/Library/assetDatabase3
	Golden_Dorks/Library/metadata/00/00be4381c8be7354f892a94bb1a896d9

	modified:   ../Assembly-CSharp-firstpass-vs.csproj
	modified:   ../Assembly-CSharp-firstpass.csproj
	modified:   ../Assembly-CSharp-vs.csproj
	modified:   ../Assembly-CSharp.csproj
	modified:   ../Assembly-UnityScript-firstpass-vs.unityproj
	modified:   ../Assembly-UnityScript-firstpass.unityproj
	modified:   ../Assembly-UnityScript-vs.unityproj
	modified:   ../Assembly-UnityScript.unityproj
	modified:   Movement.cs
	modified:   ../Golden_Dorks-csharp.sln
	modified:   ../Golden_Dorks.sln
	modified:   ../Golden_Dorks.userprefs
	modified:   ../Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	modified:   ../Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	modified:   ../Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	modified:   ../Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	modified:   ../Library/ScriptAssemblies/Assembly-UnityScript.dll
	modified:   ../Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
Merge remote-tracking branch 'origin/master' into Milli

Conflicts:
	Golden_Dorks/Assets/Scenes/LevelTest01.unity
	Golden_Dorks/Golden_Dorks-csharp.sln
	Golden_Dorks/Golden_Dorks.sln
	Golden_Dorks/Golden_Dorks.userprefs

	new file:   Golden_Dorks/Assets/Scenes/LevelTest01.unity
	deleted:    Golden_Dorks/Golden Dorks-csharp.sln
	deleted:    Golden_Dorks/Golden Dorks.sln
	deleted:    Golden_Dorks/Golden Dorks.userprefs
	modified:   Golden_Dorks/Golden_Dorks-csharp.sln
	modified:   Golden_Dorks/Golden_Dorks.sln
	modified:   Golden_Dorks/Golden_Dorks.userprefs