added category name to ranking description
removed two unnecessary images from the public folder
working on globe spin
Merge branch 'master' of github.com:snebel/wdi_project_2
added comments to video show page
Merge branch 'master' of github.com:snebel/wdi_project_2
Merge branch 'backup'
changed circles to be cleaner
fixed tooltip duplication issue
removed unstaged files
Merge branch 'master' of github.com:snebel/wdi_project_2
removed close word from popup video
Merge branch 'master' of github.com:snebel/wdi_project_2
fixing merge conflicts
fixing merge conflicts
auto scroll slideshow disabled on flexslider
Merge branch 'master' of github.com:snebel/wdi_project_2
removed merge conflicts