Lol: it all just worked :P
Logic fixes, some changes in gui
Merge branch 'master' of https://github.com/iwob/BlueAndGray

Conflicts:
	src/gui/BoardDisplay.java
	src/gui/Main.java