mouai
Merge branch 'master' of https://github.com/jlbananes/ProjetFinalMaths

Conflicts:
	drawing.cpp
okok
Merge branch 'master' of https://github.com/jlbananes/ProjetFinalMaths

Conflicts:
	drawing.cpp
a wonderful cube