Trimming out my debugging and adding new
Merge commit '030fb01'

Conflicts:
	src/main/java/in/droun/hammernet/NetworkInterfaceInfo.java