salut =)
...
Merge branch 'master' of https://github.com/AnneHartebrodt/ProjetJava

Conflicts:
	main/Voyage.class
	main/Voyage.java
	sejour/SejourItinerant.class