(adri) mise à jour main et +
Merge branch 'master' of https://github.com/Milila/Bagh-Chal into Milila-master

Conflicts:
	main.c
(adri) diverses améliorations
(ana) final