fixing some things Git messed up
Merge branch 'master' of https://github.com/Pholey/poll-extraction-test
fixing some things Git messed up