modified:   README.md
	modified:   index.php
	deleted:    php/basic/#config.php#
	deleted:    php/basic/.#config.php
	modified:   php/basic/bottom.php
	modified:   php/basic/config.php
Merge branch 'master' of github.com:qigroup/web