add serious
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Script/ArmÃ©nie/world.js
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0a/0aba13c9f1acd0e4dba1eec36314d0ee
	Library/metadata/3b/3bd34ceb3c4c3404193f49ae3b6de982
	Library/metadata/59/59bf2d61fbc84f04db61dd99700e4044
	Library/metadata/5c/5cf95324f61fc7e46994f30f44ccfaa2
	Library/metadata/5f/5fba54e65569c2347a0e740a417ffef5
	Library/metadata/60/60c26667605bc9849bd0bb18e832b0cf
	Library/metadata/77/772f89fc33ede1a4e9ae6980f59a7a8d
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/9f/9f7126bc4e3ae5342a2f37592eae0aec
	Library/metadata/c3/c39159d483817be489d573d5646ebcbb
	Library/metadata/c7/c764ce9b698de6d479cb0475e2cc523c
	Library/metadata/d1/d1dec4190f024454db832ac27590ad52
	Library/metadata/dc/dc5e7ad4324260149baa3cf4b26a7736
	Library/metadata/e3/e3bd8c530e934b54e94df5a8dfda87ee