aa4
te55
test6
AAA
Merge branch 'training' of https://github.com/ndc006/testcode into training

Conflicts:
	aatest.txt
test v6