some fixes

fixed git errors and stuff stuff
Added addTally and addScore methods  to GameState, adds whatever number
you give them to the tally/the player you give them’s score.

Also, as a quick note for saving all of our time:
USE GETTERS AND SETTER AND DON’T UPLOAD BROKEN CODE
Merge branch 'master' of https://github.com/trowbrid16/Cribbage-Game

Conflicts:
	src/com/cs301/cribbage/CbgHumanPlayer.java
	src/com/cs301/cribbage/CbgLocalGame.java