Committer: Hao Ting Wang <hw1012@nirem008.ynic.york.ac.uk>

On branch nback_refactor
Your branch is up-to-date with 'origin/nback_refactor'.

Changes to be committed:
	modified:   example_trial_generator.py
	modified:   parameters/ConditionsSpecifications_ES.csv
	modified:   parameters/TrialSpecifications.csv
	modified:   run.py
	modified:   settings.py
	deleted:    src/_ynicmr.py
	modified:   src/datastructure/datastructure.py
	modified:   src/datastructure/stimulus.py
	renamed:    src/datastructure/trialtype.py -> src/datastructure/trial_library.py
	modified:   src/experiment.py