restore
Merge branch 'master' of https://github.com/wchapman/wchapman.github.io

Conflicts:
	index.html
	params.json
	stylesheets/normalize.css
	stylesheets/styles.css