commit
Merge branch 'master' of https://github.com/flashsword20/dnstools

Conflicts:
	target/classes/us/codecraft/dnstools/InetConnectinoProperties.class
	target/classes/us/codecraft/dnstools/WindowsInetManager.class