pas bon
Merge branch 'master' of https://github.com/Stoufy/42

Conflicts:
	ALGO-1-001/ft_printf/ft_printf.c