Merge branch 'rachelsbranch'
Merge branch 'master' of https://github.com/rllhenson/ecommerce

Conflicts:
	ia03 copy/product1.php
	ia03 copy/signin.html
Merge branch 'master' of https://github.com/rllhenson/ecommerce

Conflicts:
	ia03 copy/product1.php
	ia03 copy/signin.html