deleted:    ndiaDjango/db.sqlite3
	modified:   ndiaDjango/ndiaDjango/settings.py
	modified:   ndiaDjango/ndiaDjango/urls.py
Merge branch 'master' of http://github.com/opentwincities/ndia-django