Merge branch 'gh-pages'
Updated Copy
changing to dark player
Merge branch 'master' into gh-pages

Conflicts:
	index.html