.
resolved conflicts
Merge branch 'master' of https://github.com/ChadMcKinney/Lich.js
merge
lich-mode.el improvements
merge