second commit
new feature committed
i've changed some text
another change
maybe this was not a good idea
test
some more changes
Merge branch 'dev'