test video added
Merge branch 'video'
Merge branch 'master' of https://github.com/AkermanGreg/happy

.