pre_merge
Merge branch 'master' of https://github.com/KevinHivert/3D_LABY

Conflicts:
	includes/laby.h
	sources/config.c
	sources/laby.c
	sources/my_glut.c