manger add shod
Merge remote-tracking branch 'origin/master'
manger add shod
manger add shod
Merge remote-tracking branch 'origin/master'

Conflicts:
	mng/urls.py
	mng/views.py
manger add shod
Merge remote-tracking branch 'origin/master'