Merge branch 'master' of https://github.com/erickipnis/GDD2SchrodingersTower

Conflicts:
	Assets/GameScene.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/25/25a722b4da7fab447b9b470b6768b363
	Library/metadata/51/510149cf2ec18244bb3ea2edbd148776