shawnbro/quick_shark — pull request #11 by qiheme (2014-03-20 20:13:24+00:00)
Title: updated flickr api call

Two lines...shouldn't be any merge conflicts