Change to the testy file.
Merge branch 'master' of https://github.com/sciencex/test

Conflicts:
	testdoc.txt