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

Conflicts:
	bmail