deleted:    .DS_Store
	deleted:    Byguitar/.DS_Store
	deleted:    Byguitar/Lib/.DS_Store
	deleted:    Byguitar/Lib/Action/.DS_Store
	deleted:    Byguitar/Lib/Action/Home/.DS_Store
	deleted:    ThinkPHP/.DS_Store
	modified:   Byguitar/Lib/Action/Home/IndexAction.class.php
	modified:   Byguitar/Lib/Action/Home/PublicAction.class.php
Merge pull request #3 from bythink/master

QQ
Merge branch 'master' of https://github.com/mwq2020/byguitar

Conflicts:
	Byguitar/Lib/Action/Home/PublicAction.class.php
	modified:   Byguitar/Lib/Action/Home/PublicAction.class.php
	modified:   Byguitar/Lib/Action/Home/ReceiveAction.class.php
	modified:   Byguitar/Lib/Action/Home/ReceiveAction.class.php
	Byguitar/Lib/Util/WeiboApi.class.php
	new file:   Byguitar/Lib/Util/WeiboApi.class.php
	modified:   Byguitar/Lib/Action/BaseAction.class.php
	modified:   Byguitar/Lib/Action/Home/IndexAction.class.php
	modified:   Byguitar/Lib/Action/Home/PublicAction.class.php
	modified:   Byguitar/Lib/Action/Home/ReceiveAction.class.php
	modified:   Byguitar/Tpl/default/Home/Index/index.html
	modified:   Byguitar/Tpl/default/Home/Public/header.html
	modified:   Public/Js/common.js
	modified:   ThinkPHP/Vendor/qqh/inc.php
	modified:   Public/Js/common.js
Merge pull request #19 from mwq2020/master

QQ and weibo 联合登陆