FeedPopUp Add Images
Merge branch 'master' of https://github.com/PRX/pop-up-archive

Conflicts:
	Gemfile.lock
	app/models/file_storage.rb