Initial Commit
Merge branch 'master' of https://github.com/whatever-org/commerce

Conflicts:
	.gitignore