adding new settings
adding test from master
Merge branch 'master' of https://github.com/leandromaia/playground
Merge pull request #1 from leandromaia/for_tests

For tests -> tests of pull request
adding new tests for django exercices
Merge branch 'master' of https://github.com/leandromaia/playground