line numbers
merge
merge
Merge branch 'master' of github.com:jeena/emacs.d
removed cache files
moved .el files to lisp/