slight modification to board.java and boardtest
changed boardtest
changed board.java to avoid conflict
resolve conflict