pending changes
pending changes

Conflicts:
	Unity Project/Library/EditorUserBuildSettings.asset
	Unity Project/Library/InspectorExpandedItems.asset
	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/Library/guidmapper
	Unity Project/Library/metadata/1a/1a76f5917201c49c8b8a741037e253c8
	Unity Project/Library/metadata/3d/3d8b253cfefbf48bb913a0aa3daf2453
	Unity Project/Temp/UnityTempFile-083f0c3996f6845af91fae59ac2812ff
	Unity Project/Temp/UnityTempFile-0dbf48ad111f64d618dc6d06a43bcc26
	Unity Project/Temp/UnityTempFile-198608e2f3b234562b11452374a22197
	Unity Project/Temp/UnityTempFile-1f0630d4ca9f844f9a5e73ad95b134e9
	Unity Project/Temp/UnityTempFile-2b2880b25ea604c42a4dcf0b6fb392cd
	Unity Project/Temp/UnityTempFile-3c41952f90f0d41ddafd94f43f32e7b3
	Unity Project/Temp/UnityTempFile-67342ac971d1248ba82c743dc56e1fc0
	Unity Project/Temp/UnityTempFile-6f05d4dd122de46e09806a00720fcc40
	Unity Project/Temp/UnityTempFile-83b2b80b02e374a968d658fc46a90d17
	Unity Project/Temp/UnityTempFile-a219b2e89506640ffa20bf26899def5a
	Unity Project/Temp/UnityTempFile-af686fb3d956a43c9b1341edb9ca6e1a
	Unity Project/Temp/UnityTempFile-b0c93aecd26704da69f9f139168f2250
	Unity Project/Temp/UnityTempFile-cf85a783313244efe997b2be38230bab
	Unity Project/Temp/UnityTempFile-e0e8bb142cb594c7f897eca71a1660ca
	Unity Project/Temp/UnityTempFile-e551a1c01060e4a2fab5b102f4251613
	Unity Project/Temp/UnityTempFile-ef6e2755d39c941f9b6618cd6edf3085
	Unity Project/Temp/__EditModeScene
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
Merge branch 'master' of https://github.com/anttiviljami/ld28

Conflicts:
	Unity Project/Library/EditorUserBuildSettings.asset
	Unity Project/Library/InspectorExpandedItems.asset
	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/Library/guidmapper
	Unity Project/Library/metadata/1a/1a76f5917201c49c8b8a741037e253c8
	Unity Project/Library/metadata/3d/3d8b253cfefbf48bb913a0aa3daf2453
	Unity Project/Temp/UnityTempFile-083f0c3996f6845af91fae59ac2812ff
	Unity Project/Temp/UnityTempFile-0dbf48ad111f64d618dc6d06a43bcc26
	Unity Project/Temp/UnityTempFile-198608e2f3b234562b11452374a22197
	Unity Project/Temp/UnityTempFile-1f0630d4ca9f844f9a5e73ad95b134e9
	Unity Project/Temp/UnityTempFile-2b2880b25ea604c42a4dcf0b6fb392cd
	Unity Project/Temp/UnityTempFile-3c41952f90f0d41ddafd94f43f32e7b3
	Unity Project/Temp/UnityTempFile-67342ac971d1248ba82c743dc56e1fc0
	Unity Project/Temp/UnityTempFile-6f05d4dd122de46e09806a00720fcc40
	Unity Project/Temp/UnityTempFile-83b2b80b02e374a968d658fc46a90d17
	Unity Project/Temp/UnityTempFile-a219b2e89506640ffa20bf26899def5a
	Unity Project/Temp/UnityTempFile-af686fb3d956a43c9b1341edb9ca6e1a
	Unity Project/Temp/UnityTempFile-b0c93aecd26704da69f9f139168f2250
	Unity Project/Temp/UnityTempFile-cf85a783313244efe997b2be38230bab
	Unity Project/Temp/UnityTempFile-e0e8bb142cb594c7f897eca71a1660ca
	Unity Project/Temp/UnityTempFile-e551a1c01060e4a2fab5b102f4251613
	Unity Project/Temp/UnityTempFile-ef6e2755d39c941f9b6618cd6edf3085
	Unity Project/Temp/__EditModeScene
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln