Ignoring agendas.
Merge branch 'master' of github.com:danlamanna/dotfiles

Conflicts:
	.emacs.d/emacs.org