Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html
	stylesheets/misc.css
	stylesheets/tableFormat.css
Merge branch 'master' of https://github.com/shtaft/VicCityMusic

Conflicts:
	scripts/Main.js
	scripts/NavigationBarColorChange.js
	scripts/Scroll.js
	stylesheets/nav.css