quick fix
Merge branch 'master' of https://github.com/rbandee/testrepo1

Conflicts:
	Chess/src/hu/rbandee/chess/pieces/ChessBoard.java