sss
add catr
aaaaaA
Merge branch 'categories'
this is unusual commit
added account page and style
Merge branch 'account'
added cart page links to it
made redesign, added links to pages
Merge branch 'cart'
Merge branch 'redesign'

Conflicts:
	home.htm