.gitignore staged
init-gnus.el removed from repo
Merge branch 'master' of github.com:cgroll/dot_emacs.d

Conflicts:
	.gitignore