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

Conflicts:
	.vimrc