some perl stuff
conflict resolved
Merge branch 'master' of github.com:tyrust/emacs-config
Added .gitignore.

Renamed desktop file to be hidden.

Added some lua config.

Deleted session file... never should have been there.
More gitignore changes.