video data
Merge branch 'master' of https://github.com/vkarappa1/SLstatsproject

Conflicts:resolved
	src/data_analysis/video_duartions.txt
	src/videodata.py