Merge branch 'gh-pages'

Conflicts:
	javascript/script.js