shopping folder added
design is in progress
second part done
third part done
1st page
header added
index page by me
header added
css added
this is my work
Merge branch 'group2' into forDesigners
Merge remote-tracking branch 'origin/forDesigners' into forDesigners

Conflicts:
	shopping/css/style.css
	shopping/index.html
this is page
vendor_dashboard page added
Merge remote-tracking branch 'origin/forDesigners' into forDesigners
register page modified
index page with pop up login
commit
files commited
this