Install zenburn theme
Merge branch 'master' of https://github.com/satoshi-takano/emacs-config

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents