server start
Merge branch 'master' of github.com:cohei/dotemacs

Conflicts:
	init-ubuntu.el