Scaffolding for test_settings
adding travis.yml file
Merge branch 'master' of github.com:andrefarzat/django-master

Conflicts:
	README.md