Added a comment
Merge branch 'colin'

Conflicts:
	Board.java