Renamed home page to follow corporate guidelines
Renamed stylesheet for the home page
Deleted contact us page
Deleted stylesheet for contact us page
Added log files and .DS_Store to .gitignore
Modified gitignore to allow special log to be committed
Adding special log to show how log output should look
Added search page
Added categories page
Added products 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'

Conflict in home.htm between link to cart and new page design. Make link match the new page redesign and saved
Added checkout page