add some var
Merge branch 'master' of github.com:UbermenschJO/dotfiles

Conflicts:
	.emacs
remove some files
add xmonad