removed another frowny face; moved window timeout on error to showAlert() function
separated alerts for browser-blocked and VU Campus perimeter
Merge branch 'pr/7'

Conflicts:
	scripts/locate.js