aa
erge branch 'master' of https://github.com/laiall/my-emacs

Conflicts:
	init.el