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

Conflicts:
	Makefile
ok
okMerge branch 'master' of https://github.com/boufflGEpitech/nibbler

Conflicts:
	Makefile
	src/main.cpp