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 branch 'master' of https://github.com/mwq2020/byguitar

Conflicts:
	Byguitar/Lib/Action/Home/PublicAction.class.php