Final changes.
Merge branch 'master' of https://github.com/cputinar/LISP

Conflicts:
	lisp_pt1