more stuff
Merge branch 'master' of https://github.com/CaptainKirby/Starvationcy

Conflicts:
	Assets/Textures/Combo.png.meta
	Assets/Textures/Grease_bar.png.meta