Trying to debug collections relationship
Merge branch 'master' of github.com:apochocolate/viddo
Trying to fix merges
Updated associations with user and video to has_and_belongs_to_many. Removed relationships table and replaced with collections_videos
Fixed head merge issues