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

Conflicts:
	css/grayscale.css
	index.html