JPA
Merge branch 'master' of
https://github.com/MathieuWickers/TPAssociation.git

Conflicts:
	TpAssociation_JPA/build/classes/.gitignore
	TpAssociation_JPA/build/classes/fr/iut/tp/tests/BDDtest.class
	TpAssociation_JPA/src/fr/iut/tp/tests/BDDtest.java