Fixed database
Merge conflict changes with requirements.txt and test_settings.py
Merge pull request #27 from rocketu/logic

Fixed database