Merge branch 'master' of github.com:paradigmshift/locker

Conflicts:
	commit-info.md
	locker-tests.lisp
Merge branch 'master' of github.com:paradigmshift/locker

Conflicts:
	commit-info.md