Skeleton
Merge branch 'master' of github.com:godaddy/spree_product_sale

Conflicts:
	.gitignore
	README.md