created the function changePlayer and did some test on it
fixed some conflicts in TicTacToeTest.java
some little changes in the program
fixed some conflict
fixed some conflicts