testing with jekyll
Merge branch 'master' of https://github.com/scottdonaldson/scottdonaldson.github.io

Conflicts:
	index.html
	params.json