keeping up to date
Merge branch 'master' of https://github.com/ssameng/Workshop-8-20

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Resources/Prefabs/Level.prefab
	Assets/Scenes/scene1.unity
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/2b/2b3e9d86d44a54b70b803743681c63e1
	Library/shadercompiler-1.log
	Workshop-8-20-csharp.sln
	Workshop-8-20.sln
	Workshop.app/Contents/Data/Managed/Assembly-CSharp-firstpass.dll
	Workshop.app/Contents/Data/Managed/Assembly-UnityScript-firstpass.dll