initial commit
Merge branch 'master' of https://github.com/magshi/shop-with-conscience

Conflicts:
	templates/index.html
Put data inboxes
Merge branch 'master' of https://github.com/magshi/shop-with-conscience

Conflicts:
	templates/index.html
	templates/product.html