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

Conflicts:
	home/.vimrc
	home/.xinitrc