better version
Merge branch 'master' of https://github.com/zhaorui/ShellHack

Conflicts:
	apple_uid.test

merge from the  origin/master