Ajout de class1.txt
Suppression de class1.txt
Merge branch 'hotfix-0.2' into develop
Adding code
Adding feature 1 inside Class1
Adding more code
Still more code
Merged conflict
Merge branch 'feature-1' into develop

Merging feature-1 into develop
Small changes before the release of the version 1.0
Small bugfixes
Last changes
Merging version-1.0 into master