undo and replace
Merge branch 'master' of https://github.com/takady/.emacs.d

Conflicts:
	init.el
no use custom color theme