Merge pull request #4 from wulfy/branche1

Branche1
inte
inte2
Merge pull request #5 from wulfy/branche2

Branche2
Merge branch 'master' into branche1