knowledge representation
Merge branch 'master' of https://github.com/wangjiaji/paip

Conflicts:
	objects.lisp