Team Flickr
Merge pull request #2 from jkroening/master

Team Flickr