Merge branch 'hotfix-include-angles' into develop
Update data submodule with F pilot data
Update paths and filenames in parse_human_data.py
Handle case where angle is None
Convert color names to "color0" and "color1"
Specify experient versions to consolidate
Check for color0 and color1 instead of red and yellow
Merge branch 'process-data' into develop
Remove autogenerated .py files
Merge branch 'cleanup' into develop
Initial analysis of oneshot stimuli
Rerun cells with newer stimuli
Load human data
Load model with human stims
Plot human vs model stability responses
Plot human vs. model mass judgments
Add the rest of the pilot data
Update data submodule: add batch results
Merge branch 'pilot-F' into develop
Merge branch 'pilot-F' into oneshot-analysis