commit to undeletion

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

Conflicts:
	BlackHat/STUDIO PROJECT/BlackHat.v11.suo
	BlackHat/STUDIO PROJECT/BlackHat/Form1.Designer.cs
	BlackHat/STUDIO PROJECT/BlackHat/bin/Debug/BlackHat.exe
	BlackHat/STUDIO PROJECT/BlackHat/bin/Debug/BlackHat.pdb
	BlackHat/STUDIO
PROJECT/BlackHat/obj/Debug/BlackHat.csproj.FileListAbsolute.txt
	BlackHat/STUDIO
PROJECT/BlackHat/obj/Debug/BlackHat.csproj.GenerateResource.Cache
	BlackHat/STUDIO PROJECT/BlackHat/obj/Debug/BlackHat.exe
	BlackHat/STUDIO PROJECT/BlackHat/obj/Debug/BlackHat.pdb