Added gitignore
Modified gitignore to save example.log
Added contact.html
Added contact.css
commit 1
commit 2
Merge branch 'products'
1
2
categories 1
categories 2
Merge branch 'categories'
Merge branch 'search'
Added my account page
Added link to my account page
Homepage redesign
Merge branch 'my_account'
Fixed merge conflicts
Added feature1 html
Added feature 2 css