Merge pull request #21 from kelvinblade/master

merge
set up carousel template and category backend linkage
merge conflict
Fix comment section only show up for correct video