Modify.emacs file.
Modify org-mode config.
Modify font.
Add ext file.
etc.
Merge branch 'master' of https://github.com/yangwj/emacs-conf

Conflicts:
	jain-config/.emacs