linux test
Merge branch 'master' of github.com:lensic/mytest

Conflicts:
	readme.txt