Add feature1
Add feature2
Added additional features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug #1234
Really fixing the bug
Some fixes
Fix3 fix
Fix3 fix

Conflicts:
	file2.txt
Merge