Merge branch 'master' of https://github.com/Cobalt-Studios/BlackHat

Conflicts:
	BlackHat/STUDIO PROJECT/BlackHat.v11.suo