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

merge
User shows on question, questions show on user
Merge branch 'master' into greg

Users on questions questions on users