updated code
Merge branch 'master' of github.com:jafna/video_consentration