Merge branch 'h6-gentoo-danil' into h5-ubuntu-danil
skippy xd and emacs
Merge branch 'h5-ubuntu-danil' of github.com:danil/dotfiles into h5-ubuntu-danil
update xchainkeys
Merge branch 'h5-ubuntu-danil' into h6-gentoo-danil

Conflicts:
	.Xresources