maryam market basket and buying process done
Merge remote-tracking branch 'origin/master'

Conflicts:
	MFSharif/views.py
	db.sqlite3