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

Conflicts:
	DudesNDungeons2D/Assets/Textures/AbsorbPower.png.meta
	DudesNDungeons2D/Assets/Textures/AtkSpeedPower.png.meta
	DudesNDungeons2D/Assets/Textures/FlamePower.png.meta
	DudesNDungeons2D/Assets/Textures/ImpactCrater.png.meta
	DudesNDungeons2D/Assets/Textures/KnockBack.png.meta
	DudesNDungeons2D/Assets/Textures/RagePower.png.meta
	DudesNDungeons2D/Assets/Textures/RegenPower.png.meta
	DudesNDungeons2D/Assets/Textures/ShadowStabPower.png.meta
	DudesNDungeons2D/Assets/Textures/TeleportPower.png.meta
	DudesNDungeons2D/Assets/Textures/bruteAtk3WithCrater.png.meta
	DudesNDungeons2D/Assets/Textures/bruteAtk3WithCraterR.png.meta