modifff
Merge branch 'master' of https://github.com/ThomasLYET/ProjetCompil

Conflicts:
	tp.y
	tp.y~
Version non-conflictuelle de tp.y
ajout-tp.h