Modification du cachier des charges
Merge branch 'master' of https://github.com/AniceK/craketeam

Conflicts:
	Documentation/Cahier_des_charges/Cahier_des_charges.tex