logical
Merge remote-tracking branch 'origin/origin'

Conflicts:
	src/core/Board.java