using poole/hyde static site generator
Merge branch 'master' of https://github.com/jboysen/jboysen.github.io

Conflicts:
	index.html