modified init-local
Merge branch 'master' of github.com:cauchycai/emacs.d

Conflicts:
	lisp/init-local.el