geolocation
resolved merge conflict in stats controller
Merge pull request #18 from nealcpeters/neal

Neal