Wednesday June 4th commit, added the Demographics model for the DjangoApp
Merge branch 'master' of https://github.com/dcarrot2/DjangoSunstreet

Conflicts:
	db.sqlite3
	demographics/admin.py
	demographics/admin.pyc
	demographics/models.pyc
	sunstreet/urls.py
	sunstreet/urls.pyc