.gitignore
merge
Merge branch 'master' of http://github.com/edvorg/emacs_configs into osx