org-mode font size
Merge branch 'master' of github.com:Wangzongcan/.emacs.d

Conflicts:
	config.org