wert
Merge branch 'master' of github.com:captainkuro/my_lib

Conflicts:
	Domain2Ip.php