Update-- Controller.java and Board.java
Fixed Conflicts