first commit
second commit
third commit
Revert "third commit"

This reverts commit 1ef25b8d0067621b4310b82c7c076a38f1a7b33c.
newfeature commit
master commit
Merge branch 'newfeature'

Conflicts:
	readme.txt
new feature commit once again
Merge branch 'newfeature'

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/Keloo/test