version 2.0
Merge branch 'master' of https://github.com/yhx189/tsh

Conflicts:
	runtime.c
	runtime.h
	tsh.c