changed in development
changed in master
Merge branch 'development'

Conflicts:
	test.txt