提交
Merge branch 'master' of https://github.com/ershor/PlayBox

Conflicts:
	readme.txt
测试