Added feature2
Added additional features to feature 2
Added feature3
Fixed bug 1234
Really fixing bug 1234
Added fix1
Added fix2
Added fix1

Conflicts:
	file1.txt
Merged