Merges yay
Merge branch 'master' of github.com:scottrice/Mosaic
Adds working FlickrImageProvider
Merge branch 'master' of github.com:scottrice/Mosaic