web index
Merge branch 'master' of github.com:zhaojinhong/php

Conflicts:
	index.php