maybe?
Merge branch 'master' of https://github.com/nkornek/BossPants
push ittt
Merge branch 'master' of https://github.com/nkornek/BossPants

Conflicts:
	Bosspants Unity/Assets/Sprites/SpinKick1_1.png.meta
	Bosspants Unity/Assets/Sprites/SpinKick1_2.png.meta
	Bosspants Unity/Assets/Sprites/SpinKick1_3.png.meta
	Bosspants Unity/Assets/Sprites/SpinKick1_4.png.meta
	Bosspants Unity/Assets/Sprites/SpinKick1_5.png.meta
	Bosspants Unity/Assets/Sprites/SpinKick1_6.png.meta
	Bosspants Unity/Library/assetDatabase3
	Bosspants Unity/Library/guidmapper