monoOne-Powerline
Merge branch 'master' of github.com:perenecabuto/my-vim-profile

Conflicts:
	vimrc