d

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

Conflicts:
	README.md
Merge branch 'master' of https://github.com/dwstoll/dwstoll.github.io