setup
Merge branch 'master' of https://github.com/rezwanau/Djangostuff
blog and category model