added videos'
fixed format issues, added videos
index.html merge conflict
updated commit to force merge
fixing git issues