add file
Merge branch 'master' of https://github.com/freefishyoyo/test

Conflicts:
	readme.txt