Ecommerce Plugin for Rails
Merge branch 'master' of https://github.com/saurabhbhatia/ecom

Conflicts:
	.gitignore