affichage fini
Merge branch 'master' of https://github.com/Milila/Bagh-Chal into Milila-master

Conflicts:
	main.c