Major updates to model logic
Merge attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChessGame/src/GUI/ChessModel.java