adding 2nd configuration
testing branch
Default Applications
Merge branch 'arch' of github.com:haude/my-config into arch
Update
Merge branch 'master' into arch
Merge branch 'arch' into rho-dell

Conflicts:
	bash/bashrc.d/rho.alias
	emacs/emacs
	openbox/touchpad.sh