Latest config
Latest
Merge branch 'master' of https://github.com/emiel/dotfiles

Conflicts:
	x11/Xresources