started on main
Merge branch 'Nate' of https://github.com/gccjackofalltrades/https---github.com-gccjackofalltrades-Card-War into Nate

Conflicts:
	War/War.sdf
	War/War.v11.suo
	War/War/GameManager.cpp