added background color to video show grid
Merge branch 'master' of github.com:snebel/wdi_project_2
got js circles working
styled video show fonts and added link back button
Merge branch 'master' of github.com:snebel/wdi_project_2
got js circles working
Merge branch 'master' of github.com:snebel/wdi_project_2
to push
Merge branch 'master' of github.com:snebel/wdi_project_2

Conflicts:
	app/views/layouts/application.html.erb
got js circles working
deleted js file
commit
got custom country circles working
Merge branch 'master' of github.com:snebel/wdi_project_2
fixing merge conflicts
merge conflict removed
Merge branch 'master' of github.com:snebel/wdi_project_2

Conflicts:
	app/views/layouts/application.html.erb
added class to hovertip thumbnail
merge conflicts
Merge branch 'master' of github.com:snebel/wdi_project_2