y or n for elisp in org mode
Merge branch 'master' of github.com:ajschumacher/newdot

Conflicts:
	.emacs