merge
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git

Conflicts:
	src/main/java/com/formation/virgin/entity/Client.java
j'ai crée la classe Article
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git
j'ai crée la classe article