video model rspec
finish comment test
Merge branch 'master' into comment-test
merge con
fixed conflict
Merge pull request #20 from hgw2101/fixedconflict

Fixedconflict