Validator run, updates made
Merge branch 'master' into gh-pages

Conflicts:
	css/stylesheet.css
	index.html