Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious

# Conflicts:
#	background.js
#	content.js
#	options/options.js

options/options.html

@@ -4,6 +4,7 @@
   <link href="options.css" rel="stylesheet"/>
 
   <script src="../utils.js"></script>
+  <script src="../SB.js"></script>
   <script src="options.js"></script>
 </head>