fix
Merge branch 'master' of https://github.com/cokepluscarbon/geoip

Conflicts:
	target/classes/META-INF/maven/com.cokepluscarbon/geoip/pom.properties