video in place
merge conflicts
Merge branch 'master' of github.com:12sm/jinglegram