Mon commit en local
Merge branch 'master' of https://github.com/HugoPoi/demogit2

Conflicts:
	test