make two_alt_choice general for any number of choices
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #11 from MarvinT/dev

make two_alt_choice general for any number of choices