display changes
Merge branch 'master' of https://github.com/shiryu16/ACT_R

Conflicts:
	constant_dprime-retrieval.lsp