Merge branch 'develop'
merge conflict
added google api key
removed coffee for a second
new radius
more precise radius
fixed gsub error
debugging
trying to get out of lockout
restored a previous state
small tweaks