deleted file
Merge branch 'master' of github.com:narutosanjiv/rails_multimedia
added the video controller