user_video views/controller, renames user views folder to be users
user_videos
fixing merge conflicts
Merge pull request #3 from SIBPairProject/master

Merging From Master