Revert "Merge branch 'master' of https://github.com/atom-morgan/BitPoll"

Conflicts:
	article/views.py
	bitpoll/urls.py