sample video playing nicely
fixed merge
Merge branch 'master' of https://github.com/neokee/killin-it