some changes
Merge branch 'master' of https://github.com/iwob/BlueAndGray

Conflicts:
	src/gui/BoardDisplay.java