commit
Merge branch 'feature1' of https://github.com/offmagic/test into feature1

Conflicts:
	file1.txt