Added emacs config file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.emacs.d/init.el