lala
Merge branch 'test'

Conflicts:
	readme2.txt
Merge pull request #2 from ch82/master

sds