asd
Merge branch 'master' of https://github.com/noncopyable/dot

Conflicts:
	emacs.el