test
Merge branch 'master' of https://github.com/kvelleyen/jpasample

Conflicts:
	src/main/java/Personne.java
	src/main/java/Voiture.java
	target/classes/Personne.class
	target/classes/Voiture.class