testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	IcyTowerClone-csharp.v11.suo
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/71/7197536a6cdeb874dbbc7b443fd6ccfb
	Library/metadata/ac/ac5d21b0745893f42b2ee49608bd068d
	Library/metadata/ca/ca7f1f1195e2cce44a423a6ae2c9c204
	Temp/UnityTempFile-022e005253ca8544fa7b3550e7c6e68c
	Temp/UnityTempFile-4343e7ace4dd6d540a2c2829eaa75b7e
	Temp/UnityTempFile-6e5270f8e9b3cff4aa3a712ccf5bdf28
	Temp/UnityTempFile-877d7aca7ca473c449ce75745c630954
	Temp/UnityTempFile-d29514aba745463428cf093f0844a178
	Temp/UnityTempFile-df572c18eb687b543b168e39065eebaa
	Temp/__EditModeScene
Merge branch 'master' of https://github.com/DavidKoenig/IcyTowerClone

Conflicts:
	Assets/SimpleGame3.unity
	IcyTowerClone-csharp.v11.suo
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/ca/ca7f1f1195e2cce44a423a6ae2c9c204