fixture obj from video, can't put actual video in. (too big)
ignore videos
Merge remote-tracking branch 'origin/master'