price upload
check
Merge branch 'master' of github.com:aijogja/Myton_Django_Project

Conflicts:
	.gitignore
	Myton_Django/settings.py