rr
Merge branch 'master' of https://github.com/Cyn4ck/ECE_Projet1

Conflicts:
	fonctions.c
enleve les chevrons de merde