Works things again
Merge branch 'master' of https://github.com/anttiviljami/ld28

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity
Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity
Project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Unity
Project/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Unity Project/Library/assetDatabase3
	Unity Project/Temp/UnityTempFile-033492263bcc24961bb50a4f22266292
	Unity Project/Temp/UnityTempFile-061d378d13dd94ddeb6406194a5e7d69
	Unity Project/Temp/UnityTempFile-166ff3283b32f449fa522042b05cf7c0
	Unity Project/Temp/UnityTempFile-293d53d3401e043daa2da51ad01ac7e7
	Unity Project/Temp/UnityTempFile-31d20c9b61f4849c4a8fb62700c22942
	Unity Project/Temp/UnityTempFile-377fc601725ce46c1a3719036e1a3e5e
	Unity Project/Temp/UnityTempFile-ce1d2f419ebeb4dceb195aa38f172308
	Unity Project/Temp/UnityTempFile-db0a10da649524700b2e59497a05523c
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln