Merge branch 'master' of ssh://localhost:8443/manato/detection_from_videoFile

Conflicts:
	README.md
Merge branch 'master' of ssh://localhost:8443/manato/detection_from_videoFile