added feature
Merge branch 'feature'

Conflicts:
	test.txt