adding contact.html
adding contact.css
adding products
adding css
Merge branch 'products'
adding some search html
adding some search css yo
some cat html code stuff
some css code for this stuff
Merge branch 'categories'
Merge branch 'search'
my account
changed the home
redesign home page
Merge branch 'myaccount'
Merge branch 'redesign'

Conflicts:
	home.htm
feature1's html
feature1's css
Merge branch 'feature1'
2 html