Added flickr link for photos
Merge branch 'flickr'