hoge
Merge branch 'master' of https://github.com/taichouchou2/dotfiles
iroiro
Merge branch 'master' of https://github.com/taichouchou2/dotfiles

Conflicts:
	.vim/config/.vimrc
	serclet
remove serclet
huge
Merge branch 'master' of https://github.com/taichouchou2/dotfiles

Conflicts:
	.vim/config/.vimrc