.settings change
Merge branch 'master' of git@github.com:andybergon/eCommerce.git

Conflicts:
	eCommerce/.settings/org.eclipse.wst.common.component