first django commit
Merge https://github.com/rudyal/dj-site