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

Conflicts:
	index.html
	params.json
	stylesheets/stylesheet.css