Merge remote-tracking branch 'origin/combat' into combat

Conflicts:
	ProjectIntroGT.v12.suo
	ProjectIntroGT/ProjectIntroGT/bin/x86/Debug/ProjectIntroGT.exe
	ProjectIntroGT/ProjectIntroGT/bin/x86/Debug/ProjectIntroGT.pdb
	ProjectIntroGT/ProjectIntroGT/game mechanics/Combat/Attack.cs

	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ContentPipeline-{6B33DE88-CBEF-4057-9FFA-9D74D4E20220}.xml
	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ProjectIntroGT.exe
	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ProjectIntroGT.pdb