1
Merge branch 'master' of https://github.com/dbsr/dotfiles

Conflicts:
	.vimrc
up
up