Ajout des options de pondération (ecologie, cout, temps, calorie)
Merge branch 'master' of
https://github.com/SebDuboisMIAGE/ProjetDWAR.git

Conflicts:
	Projet/war/index.jsp