Merge pull request #26 from kiopelani/ariana

styling, ajax, resolved merge conflicts
added ajax to add choice
Merge pull request #27 from kiopelani/ajax_choices

added ajax to add choice
Merge branch 'master' into ariana