Merge pull request #1 from 394BlueTeam/master

merge
js files
geosearch
geolocation
geo
geo
geo
geo
geo fix
Merge branch 'gh-pages'

Conflicts:
	js/geosearch2.js
	results.html