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

Conflicts:
	index.html
html update
update to html and css