hiul
Merge branch 'master' of https://github.com/jonbloom/ChessPrj

Conflicts:
	src/chess/ChessModel.java
	src/chess/ChessPanel.java