Color Setting
modify theme
Merge branch 'master' of https://github.com/budlion/.emacs

Conflicts:
	conf/global-conf.el