working files
Merge branch 'master' of github.com:elena/timsvideo.case