Added flickr link.
Merge remote with local.