ignore server
remove spacing in init.el
Merge branch 'master' of https://github.com/viewtao-zy/.emacs.d

Conflicts:
	.gitignore