some modify
Merge branch 'master' of github.com:jhtiboy/styletest

Conflicts:
	yang/yang/1024/monalisa/config.php
	yang/yang/1024/monalisa/index.php
Merge branch 'master' of github.com:jhtiboy/styletest