hadi
Merge branch 'hadi' of https://github.com/hadi2f244/djangoProject into hadi

Conflicts:
	blog/blog/settings.py
	blog/blog/urls.py