add
Merge https://github.com/1keyinfo/commerce

Conflicts:
	.gitignore