merge
Merge branch 'master' of http://github.com/BTS-SIO2-2013/ZombieKiller

Conflicts:
	src/consolefps/controllers/Jeux.java