updating changes from all
updating changes for merge
Merge remote-tracking branch 'upstream/master'
attempting to merge changes of jquery
Added array and hardcoding addresses for geocoding
Added map popup feature and condensed functions
Merge pull request #2 from fayeishere/master

map adding geocode translated markers
Merge branch 'master' of github.com:wobh/free_cycle
prep for heroku
Merge branch 'master' of github.com:criskelly/free_cycle
fixed call to make_recent_offers_data in make_recent_offers_web_data