garbage commit
Merge branch 'master' of http://github.com/rafoo/my-emacs-config

Conflicts:
	.emacs