dummy commit for merge
Merge branch 'master' of git@github.com:andybergon/eCommerce.git

Conflicts:
	eCommerce/WebContent/user_signup.xhtml
Merge branch 'master' of git@github.com:andybergon/eCommerce.git

Conflicts:
	eCommerce/WebContent/user_signup.xhtml