Update simpleTest.txt
Merge branch 'master' of https://github.com/kisonar/development

Conflicts:
	simpleTest.txt