updated
Merge branch 'master' of github.com:lambdasakura/emacs

Conflicts:
	init.el