adding edit-server
requireding edit-server
more larger font
Merge branch 'master' of https://github.com/garaemon/emacs.d

Conflicts:
	dot.emacs