change
Merge branch 'master' of github.com:simon-rock/emacs_config
Merge branch 'master' of github.com:simon-rock/emacs_config

Conflicts:
	readme

mergge readme