add and remove choices within poll form dynamically
Merge branch 'master' of https://github.com/auditoriumCS/auditorium
working simultaniously results in this conflict