zx
Merge branch 'master' of https://github.com/bumaociyuan/AppleScripts

Conflicts:
	cd.app/Contents/Resources/Scripts/main.scpt