Added a test to check if player has a winning row
Fixed some conflicts in TicTacToe.java and TicTacToeTest.java