Ajout de trucs
OMerge branch 'master' of https://github.com/WDFK/projet-pa2

Conflicts:
	Makefile