initial commit
db change
Merge branch 'master' of https://github.com/isidorn/django