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
Updated Requirements.txt Merge Conflict
Merge branch 'develop' of github.com:rocketu/power-puff-girls into json
Merge branch 'develop' of https://github.com/rocketu/power-puff-girls into json
Merge branch 'json' of https://github.com/rocketu/power-puff-girls into json
updated views for ajax forms
Merge pull request #29 from rocketu/json

Json
Deleted some json stuff
Merge pull request #30 from rocketu/json

Deleted some json stuff
tests created