Added feature1
added feature 2
Added additional features to features2
Merge branch 'feature2_additional'

Conflicts:
	README.txt
Added feature3
fixed bug 123
Really fixing bug#1234
added fix1

Conflicts:
	file1.txt