asd
Merge branch 'master' of http://github.com/baabelfish/dotfiles
Merge branch 'master' of http://github.com/baabelfish/dotfiles
evt
Merge branch 'master' of http://github.com/baabelfish/dotfiles
Merge branch 'master' of http://github.com/baabelfish/dotfiles
asd
Merge branch 'master' of http://github.com/baabelfish/dotfiles

Conflicts:
	.vimrc