make some change on feiko.txt in feature2 branch
make some change on feiko.txt in feature3 branch
Merge branch 'feature3'
make some change on feiko.txt in feature1 branch
make some change on feiko.txt in feature1 branch again
make some change on feiko.txt in feature1 branch after rebase
make some change on feiko.txt again in feature1 branch after rebase
Merge branch 'feature1' of https://github.com/dg3feiko/gitpractice into feature1

Conflicts:
	feiko.txt