commit
Merge pull request #11 from wulfy/branche1

modifs
conflict resolved
Merge pull request #12 from wulfy/branche2

Branche2
Merge pull request #13 from wulfy/branche1

iii
Merge branch 'master' into branche1

Conflicts:
	filex