Merging issue fix.
Merge fix
Added videos, fixed merging issues, changed a title and some section names.