Update test.txt
Merge branch 'develop'

Conflicts:
	developing/test.txt