Rando
Merge branch 'master' of github.com:thejchap/.vim

Conflicts:
	.vimrc