pep8 and Pyflake compliant
created test settings file for codeship
Merge pull request #26 from rocketu/test

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

Fixed database
json views added