commit par Boris
Merge branch 'master' of
https://github.com/bouixl/iutvalence-projetS2-2013-2014-groupe17.git

Conflicts:
	bin/.gitignore
	bin/Personnage.class