bla
Merge branch 'master' of https://github.com/ryhaberecht/MiniChess.git

Conflicts:
	src/Board.java