2 classes test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	bowlingServeur.iml
	src/test/java/PartieTest.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	bowlingServeur.iml
	src/test/java/PartieTest.java