encore
mais ou menos
Merge branch 'master' of https://github.com/chachf/dotfiles

Conflicts:
	.vimrc
voilaaaa