added geo search
Merge pull request #11 from JakeRawr/master

added geo search
fix merge conflict