new file:   checkin.php
	new file:   conf/const.conf.php
	new file:   conf/foreign.conf.php
	new file:   conf/song.conf.php
	new file:   index.php
	new file:   lib/db.php
	new file:   lib/util.php
	new file:   sixresult.php
	new file:   song.php
	new file:   users.php
	deleted:    conf/const.conf.php
	new file:   doc/help.html
	new file:   doc/help.md
	new file:   doc/intro.html
	new file:   doc/intro.md
	new file:   doc/intro.txt
	new file:   doc/tongji.png
	new file:   doc/weibo.png
	new file:   conf/const.conf.php
Merge branch 'master' of github.com:neuloner/51zaoqi
	deleted:    const.conf.php
	deleted:    conf/foreign.conf.php
    deleted:    conf/song.conf.php
	deleted:    doc/help.md
	new file:   conf/foreign.conf.php
new file:   conf/song.conf.php
	new file:   doc/help.html
	new file:   doc/help.md
	new file:   doc/intro.html
	new file:   doc/intro.md
	new file:   doc/intro.txt
	new file:   doc/tongji.png
	new file:   doc/weibo.png
	deleted:    lib/util.php
	new file:   lib/util.php
Merge branch 'master' of github.com:neuloner/51zaoqi