add new branch
append "and simple"
append &simple
Merge branch 'feature1'

Conflicts:
	fix readme.txt
add merge
Merge branch 'dev'

merge with no-ff dev
fix issue 101
add new file and edit readme
Merge branch 'dev' with '--no-ff'