gemfile.lock
Merge branch 'master' of github.com:eewang/warbygram
changes
cleaned up photo feed to display comments and user names
added geolocation searching; trying to add advanced api queries
added location-based searching for warby mentions and whenever task
removed pry references
Merge pull request #10 from eewang/working_branch

Working branch
fixed merge conflicts