Site redesign
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	style.css
	style.scss