Videos page done
Merging issue-19 into develop and resolving conflicts