commit
Merge branch 'master' of github.com:yngccc/.emacs.d

Conflicts:
	init.el