modified:   .emacs.d/init.el
Merged
modified:   .emacs.d/init.el
Setup for Python
Conflicts:
	.emacs.d/init.el