alias ghjkl
err
Merge branch 'master' of github.com:urthbound/dotfiles

Conflicts:
	vimrc