Merge branch 'master' of https://github.com/whenisnever/TeamHermanMelville

Conflicts:
	MobyDick.v12.suo
	MobyDick/MobyDick/MobyDick.csproj.Debug.cachefile
	MobyDick/MobyDick/bin/x86/Debug/MobyDick.exe
	MobyDick/MobyDick/bin/x86/Debug/MobyDick.pdb
	MobyDick/MobyDick/obj/x86/Debug/ContentPipeline-{6E084EBB-0F46-4234-A817-26AE77019F32}.xml
	MobyDick/MobyDick/obj/x86/Debug/MobyDick.csproj.FileListAbsolute.txt
	MobyDick/MobyDick/obj/x86/Debug/MobyDick.exe
	MobyDick/MobyDick/obj/x86/Debug/MobyDick.pdb
	MobyDick/MobyDick/obj/x86/Debug/cachefile-{6E084EBB-0F46-4234-A817-26AE77019F32}-targetpath.txt
Merge branch 'master' of https://github.com/whenisnever/TeamHermanMelville
new attack texture, enemy dies on impact with projectile, AddEntity method in scene /additem, addnpc & addobstacle are private/, eventregion protoclass