launch

completing the touch-ups!
Merge branch 'master' of https://github.com/jerop/jerop.github.io

Conflicts:
	params.json