new multiple choice envrionment
Merge branch 'master' of github.com:kisonecat/ximera