new commits
Merge branch 'gh-pages'

Conflicts:
	Gold/index.html