Added gitignore to ignore all log files
Added example log file and modified gitignore to allow it
Added contact us page
Styled contact us page
Added products page
Styled products page
Merge branch 'products'
Added search.html
Added search.css
Committed categories.html
Committed categories.css
Merge branch 'categories'
Merge branch 'search'
Added my account page
Added link to my account page
Redesigned home page
Merge branch 'my_account'
Merge branch 'home_page_redesign'

Conflicts:
	home.htm
Committed feature1
Committed feature1 css