added newlines at the end of the files
replaced eqv? by equal?
API changed: choice and vote are now marcos