run_state_machine more robust to errors
improved error classes
merge most recent changes with my error catching
Merge pull request #10 from MarvinT/dev

run_state_machine more robust to errors
we don't need this anymore
make two_alt_choice general for any number of choices
Merge remote-tracking branch 'upstream/dev' into dev
fixed post-trial analysis
Merge pull request #11 from MarvinT/dev

make two_alt_choice general for any number of choices
fixed event handling within trials
Merge branch 'dev' into vogel
getting it working