.
Merge branch 'master' of https://github.com/DrakosGate/DX11Editor

Conflicts:
	Bin/fmod.log
added noise