modified:   README.md
Merge branch 'master' of github.com:topstarwei/ceshi

Conflicts:
	README.md

	deleted:    common/pinyin.class.php
	modified:   config/config.php
	modified:   down.php
	deleted:    ssl/.key
	deleted:    sslcache/weixing1365564006.pfx