More stuff
Merge branch 'master' of github.com:mattjbrown/DarknessGame

Conflicts:
	Assets/Test2.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/metadata/16/16a036af5583ae5489f44b594dd36cd2
	Library/metadata/1d/1d89d49704fa22d48a56a35620357dd5
	Library/metadata/25/25e54ea0ed3934f4dac160b54f7cae19
	Library/metadata/a9/a9d9fcd426e2f8d43857ceae20ad2546
	Library/metadata/c5/c5630fec49bfb964da203c63c29d4186