adding locate.py
Merge branch 'master' of https://github.com/CogswellClasses/SWE220_Linux_SP13

Conflicts:
	geoServer/cgi-bin/locate.py