Added category page
Added produts page
Merge branch 'categories'
Added my account page
Styled my account page
Merge branch 'my_account'
Added shopping cart
Added link on home page to shopping cart
Implemented home page redesign
Merge branch 'home_page_redesign'
Merge branch 'cart'

Conflicts:
	home.htm