Fix some variables in script.js
Media
Merge branch 'gh-pages' into Audio-customizations

Conflicts:
	index.html
Fixed bad merge
Merge branch 'Audio-customizations' into gh-pages
Local version of jquery
Merge branch 'Audio-customizations' into gh-pages
spacing
Merge branch 'Audio-customizations' into gh-pages