rollback test
Merge branch 'master' of https://github.com/liupenggl/code

Conflicts:
	rsel.py
	te.py