Bonsoir
Merge branch 'master' of
https://github.com/gurbuza/iutvalence-java-tp-2014-g1A-binome1.git

Conflicts:
	.gitignore