act 1 changes
act 1 changes
added slugs level 2
Merge branch 'master' of https://github.com/Darth-Knoppix/WithoutSalt

Conflicts:
	Assets/Background/Materials/grass.mat
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/0d/0df1ce76e5e85a345b832f45808a9244
	Library/metadata/4c/4c3aee8770ebcde4c897d4c8d69d113a
	Library/metadata/db/db49a6bdaa45189458122c427113953f
	Library/shadercompiler-1.log
	WithoutSalt-csharp.sln
	WithoutSalt.sln