New merchant model

Conflicts:
	main1.pyc
merchant model

merchant model