j k
Merge branch 'master' of https://github.com/vivichen/vim_config
i forget what changes
Merge branch 'master' of https://github.com/vivichen/vim_config

Conflicts:
	vimrc.bundles
add doxygen toolkit