Added flickr
Merged