Useless addition to readme file to test workflow
Pre-merge commit
Merged with remote
Added local_settings.py to .gitignore file
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Resolved merge conflicts
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Added minimal registration functionality