puffcn commit 2nd
Merge branch 'master' of github.com:puffCN/demo

Conflicts:
	phpinfo.php