Merge branch 'master' of github.com:Inhakki/coffeegrindr into develop
changed activerecord model
merge conflict
added google api key
removed coffee for a second
new radius