update
Merge branch 'master' of github.com:proycon/dotfiles

Conflicts:
	openbox/rc.xml