changes to videos and web page
Merging issue-22 into develop and resolving conflicts