Merge branch 'master' of https://code.ill.fr/cameo/cameo-tests.git

Conflicts:
	README.md

README.md

@@ -39,23 +39,23 @@ Linux
 The Java and C++ tests can be run using either jzmq or jeromq.
 
 To run all the tests with 10 iterations for each individual test:
-* Start the server with jzmq in a separate shell
+Start the server with jzmq in a separate shell
 
 	> java -classpath target/cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-api-config.xml
 	
-* Or start the server with jeromq in a separate shell
+Or start the server with jeromq in a separate shell
 
 	> java -classpath target/cameo-tests-jeromq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jeromq-api-config.xml
 	
-* Start all the tests
+Start all the tests
  
 	> java -jar target/cameo-tests-jzmq-0.0.1-full.jar all 10
 
-* Display the available tests
+Display the available tests
 
 	> java -jar target/cameo-tests-jzmq-0.0.1-full.jar
 	
-* Start a specific test
+Start a specific test
 
 	> java -jar target/cameo-tests-jzmq-0.0.1-full.jar startsimplejava 100
 
@@ -66,16 +66,16 @@ Windows
 The Java and C++ tests can be run using the jzmq-win-api-config.xml after having been compiled. Edit the win-environment.properties file to modify the path for the C++ executables. If you get the Cameo binaries without compiling the sources, you need to install Visual C++ Redistributable 2015.
 
 To run all the tests with 10 iterations for each individual test:  
-* Start the server in a separate shell
+Start the server in a separate shell
 
 	> set PATH=%ZEROMQ_HOME%\bin\x64;%PATH%  
 	> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -classpath target\cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-win-api-config.xml
 	
-* Start all the tests
+Start all the tests
 
 	> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar all 10
 	
-* Display the available tests	
+Display the available tests	
 
 	> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar