Adding feature-2 inside class1
Adding more code
Creation of feature-3
Merging release-1.0 into develop
Continuing feature-2
Adding things to feature-3
Last changes in feature-3 before release-1.1
small bugfix
Fixing merging problems : nothing changed, just letting feature-1 and feature-2
Fixing the merging conflict. Nothing changed, just removing the >>>>
Bumping to 1.1
Merging release-1.1 to master