huga
Merge branch 'master' of http://github.com/taichouchou2/dotfiles

Conflicts:
	.vim/config/.vimrc