modified:   gip/templates/dist.pt
	modified:   gip/templates/distance.pt
	modified:   gip/templates/geo_ip.pt
	modified:   gip/templates/geoip.pt
	modified:   gip/templates/google.pt
	modified:   gip/templates/scan.pt
	modified:   gip/templates/scanner.pt
	modified:   gip/views.py
	modified:   gip/views.pyc
	modified:   gip/templates/geoip.pt
Merge branch 'master' of https://github.com/veerupandey/gip
	deleted:    gip.db