detection defaite avec l'energie
Merge branch 'master' of https://github.com/PavoneM/ZuulProject.git

Conflicts:
	ZuulProject/src/zuul/Game.java
creation de config
Merge branch 'master' of https://github.com/PavoneM/ZuulProject.git

Conflicts:
	ZuulProject/src/zuul/Student.java