prepared link for screencast
templating
Also accept ShortName
Merge branch 'master' of github.com:Bruce-Connor/lisp-assistant

Conflicts:
	lisa.el