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

Branche2