Initial commit to master
Merge github.com:shermpay/EmacsConf