Merge remote-tracking branch 'origin/dev' into dev

src/logic/Board.java

@@ -49,18 +49,19 @@ public class Board{
     public boolean checkForWin(){
         //checks rows and columns
         for(int i = 0; i < 3; i++) {
-            if(gameboard[i][0] == gameboard[i][1] && gameboard[i][0] == gameboard[i][2]) {
+            if((gameboard[i][0] == gameboard[i][1]) && (gameboard[i][0] != '#') && (gameboard[i][0] == gameboard[i][2]) ) {
                 this.setWinner(gameboard[i][0]);
                 return true;
             }
-            if(gameboard[0][i] == gameboard[1][i] && gameboard[0][i] == gameboard[2][i]) {
+            if((gameboard[0][i] == gameboard[1][i]) && (gameboard[i][0] != '#') && (gameboard[0][i] == gameboard[2][i]) ) {
                 this.setWinner(gameboard[i][0]);
                 return true;
             }
 
-            }
+        }
         //checks diagonals
-        if((gameboard[0][0] == gameboard[1][1] && gameboard[0][0] == gameboard[2][2]) || (gameboard[0][2] == gameboard[1][1] && gameboard[0][2] == gameboard[2][0])) {
+        //second try to get the fix pushed
+        if((gameboard[0][0] == gameboard[1][1] && gameboard[0][0] == gameboard[2][2]) || (gameboard[0][2] == gameboard[1][1] && gameboard[1][1] != '#') && gameboard[0][2] == gameboard[2][0] ) {
             this.setWinner(gameboard[1][1]);
             return true;
         }