added handeling of videos
Merge branch 'master' of https://github.com/JesseScott/SecondStory-Android