updated for prod
removed videos
updated git ignore
merge conflicts resolved in gemfile
merge conflicts in gemfile resolved