Update test.txt
Merge branch 'master' of https://github.com/krueger/TinyAS

Conflicts:
	test.txt