Zompire2D assets
Merge branch 'master' of https://github.com/RasmusBlind/Zompire

Conflicts:
	Zompire2D/Assets/Thumbs.db.meta