dd
Revert "dd"

This reverts commit 3a07aceb6de0452e269f457fdb72c8567b93a922.
dd
ff
x
Merge branch 'master' of https://github.com/artiespeedy/Scavenge

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Prefabs/Sparkels.prefab
	Assets/Scenes/Main.unity
	Assets/Scenes/Title.unity
	Assets/Scripts/GUI/IsAlive.js
	Assets/Scripts/Objects/Rotate.js
	Assets/Scripts/Objects/Rotate.js.meta
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/01/01e10a88008016a45bef2392e047c72d
	Library/metadata/19/19e81012a984f3f478aafda12a2f0384
	Library/metadata/75/752a69f3a4d37ff44b5de408bd2fcf30
	Scavenge.userprefs