shapeoko.org not needed in master branch
Merge branch 'master' into jsk
I'm just trying to maintain a branch but I'm not sure what it does not work.  I just got rid of "shapeoko.org", not what I wanted.
bring back local customizations
Merge branch 'jsk' of https://github.com/jskksj/emacs24-starter-kit into jsk
git pull shapeoko.org
org-mode customizations imaging