made index look nice
merging
mergin
trying to merge
trying to merge
Merge branch 'niceForms'

Conflicts:
	djangosite/db.sqlite3
removing database