finish Q24
Merge https://www.github.com/ErwanDouaille/M3DS
commit tp1 done
Conflicts:
	TP1/Douaille.pro.user
	TP1/src/application/GLApplication.cpp