updated settings.py and .gitignore
Merge branch 'master' of github.com:vihryn/aligran