ResizingItem
Merge branch 'master' of https://github.com/yulcat/Falling

Conflicts:
	Assets/sprite/effect.meta
	Assets/sprite/effect/blood.psd.meta
	Assets/sprite/sample.psd.meta
	Library/AssetServerCacheV3
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/08/08ddceaaafe7041d8aacf10607aacac0
	Library/metadata/0e/0e5ec12a046af44b68b5cdcd6740c969
	Library/metadata/79/793f0f2e97ee646258efc444b939a03e
	Library/metadata/9f/9fec37b3f3b294faabb2953450a8f48c
	Library/metadata/b0/b0b8558243ac847cb8f39bcb533b639b
	Library/metadata/be/be19e2ee6c5fa47cd839b2098d9946e6