Updated parser to display number of failed reads when uploading cards, implemented history display.
need to revert this
Revert "need to revert this"

This reverts commit 51799d832bc787e669e449a4a12ad4b29b26f8b3.
Merge branch 'JRBranch1' of https://github.com/joungskim/CGProject into JRBranch1

Conflicts:
	CGProject/CGProject/AddCardsForm.cs
	CGProject/CGProject/MainForm.Designer.cs
	CGProject/CGProject/MainForm.cs
Merge branch 'JRBranch1' of https://github.com/joungskim/CGProject into JRBranch1
Re-Commit of changes
Fixed merge errors
Got Game History to display as desired.
Fixed Some Stuff That We Broke
Merge remote-tracking branch 'origin/JRBranch1' into NewBetaBranch

Conflicts:
	CGProject/CGProject/CGProject.csproj
	CGProject/CGProject/MainForm.Designer.cs
	CGProject/CGProject/MainForm.cs
	CGProject/CGProject/addPlayerForm.resx
	CGProject/CGProject/obj/Debug/CGProject.addPlayerForm.resources