a
Merge branch 'master' of github.com:sotarof/dotfiles

Conflicts:
	.vimrc
aaa