The REAL version
the REAL stuff
The REAL stuff
The REAL stuff Merge branch 'master' of github.com:Silver0ne/STSSS

Conflicts:
	Unity/YATE 2012-2013/Application/Application-csharp.sln
	Unity/YATE 2012-2013/Application/Application.sln
	Unity/YATE 2012-2013/Application/Application.userprefs
	Unity/YATE 2012-2013/Application/Assembly-CSharp-Editor-vs.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp-Editor.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp-firstpass-vs.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp-firstpass.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp-vs.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp.csproj
	Unity/YATE 2012-2013/Application/Assembly-CSharp.pidb
	Unity/YATE 2012-2013/Application/Assembly-UnityScript-firstpass-vs.unityproj
	Unity/YATE 2012-2013/Application/Assembly-UnityScript-firstpass.unityproj
	Unity/YATE 2012-2013/Application/Assembly-UnityScript-vs.unityproj
	Unity/YATE 2012-2013/Application/Assembly-UnityScript.unityproj
	Unity/YATE 2012-2013/Application/Assets/Scenes/Sandbox.unity
	Unity/YATE 2012-2013/Application/Assets/Scripts/SwipeTest.cs
	Unity/YATE 2012-2013/Application/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Materials/Water4Example.mat
	Unity/YATE 2012-2013/Application/Library/AnnotationManager
	Unity/YATE 2012-2013/Application/Library/AssetServerCacheV3
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Unity/YATE 2012-2013/Application/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Unity/YATE 2012-2013/Application/Library/ScriptMapper
	Unity/YATE 2012-2013/Application/Library/assetDatabase3
	Unity/YATE 2012-2013/Application/Library/expandedItems
	Unity/YATE 2012-2013/Application/Library/guidmapper
	Unity/YATE 2012-2013/Application/Library/metadata/01/018ad964e74da4063b2723de55ce19bc
	Unity/YATE 2012-2013/Application/Library/metadata/21/21d11ec751a3d46faa0fbdc22f9aeb84
	Unity/YATE 2012-2013/Application/Library/metadata/4e/4e1467e748fa74c64b96759b3d9713ae
	Unity/YATE 2012-2013/Application/Library/metadata/9d/9d5d1541f4779428ab2e8aad9ba6e932
	Unity/YATE 2012-2013/Application/Library/metadata/b3/b33390f438a0c48309d868e869df8c0b
	Unity/YATE 2012-2013/Application/Library/metadata/bd/bd164683ec11b4b46b82af5e247bdbc7
	Unity/YATE 2012-2013/Application/Library/metadata/cb/cb1deda9a5ffe44f28e011f5937746ed