Logo IMAC 3D
Merge branch 'master' of github.com:cchampet/OpenGL

Conflicts:
	DiveInSpace/src/main.cpp