@bartkrekelberg I have merged your kMaster changes into this branch already, so this request is so you can check the changes I have made to shared files (e.g. cic, myRig). The rest is just new stimuli and demos, so will not have any effect on anyone else.
If you are OK with this merge, we can then merge kMaster into master?
@bartkrekelberg I have merged your kMaster changes into this branch already, so this request is so you can check the changes I have made to shared files (e.g. cic, myRig). The rest is just new stimuli and demos, so will not have any effect on anyone else.
If you are OK with this merge, we can then merge kMaster into master?