Renamed home page to follow corporate windows naming conventions
Added about us page
Styled about us page
removed contact.css page
Added contact.html and contact.css
Updated index.html page
Updated index.html page
Merge branch 'contact_us'
Added search page
Merge branch 'search'
Added categories page
Added categories link on index.html
Added products page
Added link to products page
Merge branch 'categories'
merging stuff
merging stuff
Resolved merge conflict