applying stuff that i did before
Merge branch 'master' of https://github.com/nkornek/SpaceBro-Justice-Rocket

Conflicts:
	HeyBro/Library/assetDatabase3