Update
Merge branch 'master' of github.com:cybergrind/emacs_config

Conflicts:
	init.el