add c.txt, modify a.txt in feature1
Merge branch 'master' into feature1

Conflicts:
	a.txt
a.txt modified "feature1(2)"
Merge pull request #1 from jrowies/feature1

Feature1