issue 2.1
Merge branch 'development'

Conflicts:
	demo.txt