security
added xpp.el
fixed merge
fixed merge, added markdown, package