Merge branch 'master' of https://github.com/kailian/phpnotes

Conflicts:
	getip.php
Merge branch 'HEAD' of https://github.com/kailian/phpnotes.git
Merge branch 'master' of https://github.com/kailian/phpnotes
test
Merge branch 'devphp'