issue3
Merge branch 'feature2'

Conflicts:
	demo.txt