video.rb stash
merged test
merged test2
fixing merge
merge test
Merge branch 'master' of https://github.com/AkermanGreg/happy

merge