little sleep time before the begining
pre merge
Merge branch 'master' of https://github.com/KevinHivert/3D_LABY

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