Geolocation works hardcoded
Fixed Ruby and Eric
's merge conflict
Merge pull request #293 from cchan5/master

Geolocation works hardcoded.