geolocation progress
Merge branch 'master' of github.com:guitarmatt/pennapps2013