avant le merge
Merge branch 'master' of https://github.com/joelrandria/geometry_tp4

Conflicts:
	tpga4_ex1.c