ajout makefile
Ajout makefile
Merge branch 'master' of https://github.com/Ant-keke/tp-multitache

Conflicts:
	Mere.cpp