fixed player, cardgame, card, and war classes
fixed cardgame, player, card, and war classes
Merge branch 'master' of https://github.com/rsphifer/Cardglomerate

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientApplication/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientApplication/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ServerTestDriver/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ServerTestDriver/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SharedClasses/.indexes/e4/1f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SharedClasses/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SharedClasses/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1218111336.index
	.metadata/.plugins/org.eclipse.jdt.core/2715425392.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	GUI/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
Merge branch 'master' of https://github.com/rsphifer/Cardglomerate
Added war, cardgames, player, and card classes