pages
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	index.html
without s
Hidden Specification, Cleaned Code
z