clang_complete試してみる
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.vim