issues
fixed?

Conflicts:
	Assets/Spine/OldMan.atlas.txt.meta
	Assets/Spine/imp.atlas.txt.meta
	Assets/Spine/imp.png.meta
	Assets/Spine/oldman.png.meta
	Library/assetDatabase3
	Library/metadata/74/7449b9b1a362145b8a7942a30f2ffd9e
	Library/metadata/bd/bd59178ed3cef417780f19173032e360
	Library/metadata/d0/d0e0202402a994a639cbd60e213b7587
	Library/metadata/d4/d4a2c75eb5f5b4bf0b84773721876946