Added feature1
Added feature2
Added additional features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug#1234
Really fixing Bug#1234
Added fix1
Added fix2
Added fix1

Conflicts:
	file1.txt
Merge branch 'v1.0_fixes'