update
Merge branch 'master' of https://github.com/kentkomine/kentkomine.github.io

Conflicts:
	.DS_Store