what the helelll
Merge branch 'master' of https://github.com/charly077/Projet2_1252

Conflicts:
	main.c