mostly working choices controller
Merge pull request #12 from brown-bats-2014/choices_controller

mostly working choices controller