Adding modules/contrib/fitvids and a git submodule libraries/fitvids
Fixing git merge conflict