ok
okMerge branch 'master' of github.com:boufflGEpitech/bmail

Conflicts:
	Makefile