old stuff
Merge branch 'master' of https://github.com/amr390/Hellin-twinner

Conflicts:
	__init__.pyc
	customer/models.pyc
	settings.pyc
	store/models.pyc
	templates/base.html
	templates/index.html