modified:   index.html
Merge branch 'master' of https://github.com/nkern/nkern.github.io

Conflicts:
	index.html

	modified:   index.html