my first commit (araghi)
osia dahanet service
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	DB
	anbar/views.py
	anbardari/urls.py
conflict resolved