'hoge'
Merge branch 'master' of https://github.com/yoshi1108/yosh into gh-pages

Conflicts:
	.vimrc