Commented Combat.cs and Form1.cs
Merge branch 'master' of https://github.com/QRayarch/GDAPS1FINAL

Conflicts:
	Final Combat.v11.suo
	Final Combat/Combats.cs
	Final Combat/Form1.cs
	Final Combat/obj/Debug/Final Combat.pdb