Merge branch 'master' of http://gvipers.imt-lille-douai.fr/louis.bahrman/groupe3-tictactoe

nbproject/private/private.properties

-<<<<<<< HEAD
+<<<<<<< HEAD
 compile.on.save=true
 do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
 user.properties.file=C:\\Users\\timot\\AppData\\Roaming\\NetBeans\\11.2\\build.properties
-=======
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/home/louis/.netbeans/11.3/build.properties
->>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04
+=======
+compile.on.save=true
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+user.properties.file=C:\\Users\\senda\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
+>>>>>>> 4dd14568c244c833d17b679f8f3b340f997c8d04