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

Conflicts:
	Makefile
	src/main.cpp