Commit something on master branch.

Signed-off-by: AndroWiiid <androwiiid@gmail.com>
Merge branch 'master' into developing

Conflicts:
	TestLille1/src/fr/univ/lille1/Main.java


Signed-off-by: AndroWiiid <androwiiid@gmail.com>