Update Makefile
Makefile
Merge branch 'master' of https://github.com/hadrienestela/42sh

Fix conflicts:
	Makefile
	libft/Makefile