error in cp
ckS
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chess350R2/src/model/ChessGame.java