Added feature1
Added feature2
Added additional features to feature2
merged feature2_additional into master
Added stuff to feature3 file1.txt
Fixed bug #1234
Really fixing bug#1234
Added fix1
Cherry picking fix1

Conflicts:
	file1.txt
Added fix2