Merge branch 'qn-actr-compatibility'
Merge branch 'master' into addition
require text in vis-loc search
Merge branch 'master' into hard-slow
keep contents of imaginal after moving cursor
Merge branch 'addition'
Merge branch 'hard-slow'
Merge branch 'master' into easy-fast
require red for second vis-loc so we don't match green after both are clicked
Merge branch 'easy-fast'
Merge branch 'master' into greedy-polite
Merge branch 'greedy-polite' into hard-slow-greedy-polite
made visual and visual-location more rigorously greedy-polite
check for imaginal free before requesting
Merge branch 'hard-slow-greedy-polite' into greedy-polite
Merge branch 'greedy-polite'
Merge branch 'master' into qn-actr-compatibility
added build target to copy qnactr model files to the experiment directories
Merge branch 'qn-actr-compatibility'
Merge branch 'greedy-polite' into addition-greedy-polite