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

Conflicts:
	css/.sass-cache/a29dd6ab1a5ba936cd7f5ca561a3693aeb00e22d/main.scssc
	css/main.css
	css/main.scss
	index.html
hj