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

Conflicts:
	index.html
keynote
Delete