this fix is a pain
Merge remote-tracking branch 'origin/master'

Conflicts:
	SomeGame/Assets/Sprites/logo_black.png.meta
stuff