added .gitignore to ignore *.log and .DS_Store files
added example.log and set .gitignore to NOT ignore it
added contact.html
added contact.css
added products page
added products page style sheet
Merge branch 'products'

* products:
  added products page style sheet
  added products page
added search page
added search page style sheet
added categories page
added categories page style sheet
Merge branch 'categories'

* categories:
  added categories page style sheet
  added categories page
Merge branch 'search'

* search:
  added search page style sheet
  added search page
added my_account.htm
added link to my account page
redesigned home page
Merge branch 'my_account'

* my_account:
  added link to my account page
  added my_account.htm
Merge branch 'homepage_redesign'

* homepage_redesign:
  redesigned home page

Conflicts:
	home.htm
added feature1
added feature1 style sheet