mm
some stuff
Merge branch 'master' of github.com:hotgloupi/conf

Conflicts:
	vim/.vim/plugin/clang
	vim/.vim/plugin/clang_complete.vim
	vim/.vim/plugin/libclang.py
	vim/.vim/specific/d.vim
	vim/.vim/templates/cc.tpl
	vim/.vim/templates/h.tpl
	vim/.vim/templates/sh.tpl
	vim/.vimrc
	zsh/.zshrc
Merge branch 'master' of github.com:hotgloupi/conf

Conflicts:
	git/.gitignore
small font size