Merge branch 'master' of https://github.com/electology/approvalPolls

Conflicts:
	README.md