passage sur dev
Merge branch 'master' into dev

Conflicts:
	projet
	y.output
	y.tab.c
	modified:   projet.y
Merge pull request #2 from KevinHivert/dev

Dev