Added feature1
Added feature2
Added additional featuresto feature2
Merge branch 'feature2_additional'

Conflicts:
	README.md
Fixed additional features to feature2
Merge branch 'feature2_additional'

Conflicts:
	README.md
Adding feature3
FIxed bug #1234
Really fixing bug#1234

Rebasing bug1234
Added fix1
Added fix2
Added fix1
(cherry picked from commit b57a6f1)
Merge branch 'v1.0_fixes'

Conflicts:
	file1.txt