Started adding  to the video service
Merge branch 'master' of github.com:dneimke/laughNG