[#70290784] User is able to add a video and see the a list of all videos.

Signed-off-by: Evan Tedesco <evantedesco@gmail.com>
Merge branch 'master' of github.com:gusk/lingering-meadow-rails-media-manager

Conflicts:
	app/views/pictures/new.html.erb
	db/schema.rb
Merge branch 'master' of github.com:gusk/lingering-meadow-rails-media-manager

Fixed a bug
 Please enter a commit message to explain why this merge is necessary,