added feature1
Added feature2
added additionla feature ti f2
merged additional_feature 2 into master
added feature3
fixed bug 1234
added fix1
added fix2
added fix1

Conflicts:
	file1.txt
merge branch v1.0_fixes