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

Conflicts:
	getip.php