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

Conflicts:
	Makefile