Semi-Cs
Merge branch 'gh-pages'

Conflicts:
	javascript/scripts.js
Merging Fixes