Add Polls
delete hard-code poll
Merge Master and Polls (fix conflicts in DB)