main
Merge branch 'master' of https://github.com/Sophen/epitech_bistro

Conflicts:
	main.c