Merge branch 'master' of github.com:Khaes/test_tennis

Conflicts:
	src/tennis/Jeu.java
	test/TestTennis.java
Merge branch 'master' of github.com:Khaes/test_tennis

Conflicts:
	src/tennis/Jeu.java