Working on UI. Changed Facebook to Flickr in anticipation.
Setting up Flickr API.
Merge branch 'origin/master'