james 30 oct 2013
Merge branch 'master' of chai.physiol.ox.ac.uk:/yipyip/ben/git/benware
changes for astrid
james new grid
reverto user james
astrid stimulus updates
add files to previous
updates to astrid's stimuli
updates to comparison, texture grids
decorr_v2
updates to astrid's stimuli
start of expt 58 (IC); after calibration
end of ben expt 60
adjust grids.ben for next experiment
changes to james' grids before expt 32
james grids pre-expt 32
james grid changes
james changes
analysis for james
pre ben expt 61 calibration