Update
Merge remote-tracking branch 'origin/Nate' into Nate

Conflicts:
	War/Debug/War.exe
	War/Debug/War.ilk
	War/Debug/War.pdb
	War/War.sdf
	War/War.v11.suo
	War/War/Debug/CL.read.1.tlog
	War/War/Debug/CL.write.1.tlog
	War/War/Debug/Deck.obj
	War/War/Debug/GameManager.obj
	War/War/Debug/Main.obj
	War/War/Debug/War.log
	War/War/Debug/vc110.idb
	War/War/Debug/vc110.pdb