Added feature1
Added feature2
Other commits on feature 2
Merged feature 2 into master
Added feature3
Added fix 1
Added fix2
Added fix 1 for cp

Conflicts:
	file1.txt
Merge branch 'v1.0fixes'

Conflicts:
	file1.txt