try to sync with github,mac'local code is the newest
test pushing changes when the newest code is not pulled to the local
Merge branch 'master' of https://github.com/gongwq119/learn.web.git

Conflicts:
	com.gongwq.php1/web/index.html