commit
Merge branch 'master' of https://github.com/ushiromuki/ushiromuki.github.io

Conflicts:
	.gitignore