Nouvelle version
Merge branch 'master' of
https://github.com/CombeE/iutvalence-projetS2-2013-2014-groupe12.git

Conflicts:
	src/rpg/Partie.java