resume changes from yesterday
Merge pull request #122 from adamdruppe/resume_videos

resume changes from yesterday
Resolve merge conflict.