Merge branch 'master' into BranchJuly8
Merge branch 'BranchJuly8'
Merge branch 'master' into integrate-2AFC-task
created 2AFC gui
progress from 10/20/2013
doin work

"pool", figure, and sdf saving now controlled by newGUI
integrating ben's changes manually
test

test