merge commit
Merge branch 'master' of https://github.com/Lokir/Dudes-Dungeons

Conflicts:
	DudesNDungeons2D/Assets/Sounds/Beating Heart-SoundBible.com-365893575.wav.meta
	DudesNDungeons2D/Assets/Sounds/Human roar.wav.meta
	DudesNDungeons2D/Assets/Sounds/IntroSound.wav.meta
	DudesNDungeons2D/Assets/Sounds/InvulSound.wav.meta
	DudesNDungeons2D/Assets/Sounds/backpack.wav.meta
	DudesNDungeons2D/Assets/Sounds/coinsdropping.wav.meta
	DudesNDungeons2D/Assets/Sounds/evil laugh.wav.meta
	DudesNDungeons2D/Assets/Sounds/flamethrower-burning.wav.meta
	DudesNDungeons2D/Assets/Sounds/wind.wav.meta