feature1 1st change
master changes
solved conflicts
feature2 1st commit
merge feature 2 with no fast forward merge
some changes
dev changes 2
some changes
forget the changes in readme.txt