Adding email configurations for mu4e
Merge branch 'master' of github.com:satran/emacs.d

Conflicts:
	init.el