flowplayer commit
flowplayer files added
testing commit
updating ignore for ruby version in RVM
unwanted file is removed
git repository for deployment server and branch are modified
file path is modified
bug with file uploading while creating cameo is fixed
Adding HDfvr recorder
Adding CameoFile
Testing Cameo Model and Factory
Developing Cameo creation with single File
image paths are modified
kaltura playlist is replaced with flowplayer playlist
Merge branch 'new_playlist' into nokaltura
merge conflict resolved
testing commit
file name is modified
flowplayer playlist is customized to include other elements
Application is re-factored(made modular)
Adding pry
Refactoring user model and test
Refactoring cameo model and test
Merge branch 'nokaltura' of git.qwinixtech.com:repositories/rails/rvidi into nokaltura

Conflicts:
	app/controllers/cameos_controller.rb
params[:controller] is modified