C'est fini
Merge branch 'master' of https://github.com/zazanapoli/test2

Conflicts:
	total.h