Stuff
Merge branch 'Nate' of https://github.com/Hayesnj1/https---github.com-gccjackofalltrades-Card-War into Nate

Conflicts:
	War/War.sdf
	War/War.v11.suo
Should mostly be an artifact of me updating my working directery