Update GameBoard.java
merge
merge