Modified settings.py models.py-changed formatting
Merge branch 'master' of https://github.com/satish28/test_blog

merging two commits
Cleaning changes made in last commit