add tagbar
Merge branch 'master' of github.com:Fiedzia/dotfiles

Conflicts:
	.vimrc