removed tab active class
resolved merge conflict
add search youtube and speech to text
Merge pull request #15 from hgw2101/searchbox

add search youtube and speech to text
rspec testing for user model part 1
Merge pull request #16 from hgw2101/rspec_testing

Rspec testing
Merge pull request #14 from hgw2101/video-show

basic video show and view count logic working
delete migration and model files per Ryan
Merge pull request #17 from hgw2101/delete-migration-models

delete migration and model files per Ryan
added video_spec to master
video model rspec
finish comment test
video model rspec
Merge pull request #19 from hgw2101/video_spec

Video spec
Merge branch 'master' into comment-test
merge con
fixed conflict
Merge pull request #20 from hgw2101/fixedconflict

Fixedconflict
test for user complete using shoulda matchers
resolve merge conflict
Merge pull request #22 from hgw2101/resolve-merge-conflict

Resolve merge conflict