hai

Signed-off-by: Yedukondalu88 <edukondalu@vegaatechnologies.com>
Merge branch 'master' of https://github.com/swamyvegaa/oar.git

Conflicts:
	administrator/add-category.php
	administrator/add-dealer.php
	administrator/add-designer.php
	administrator/add-product.php
	administrator/designers.php
	administrator/edit-dealer.php
	administrator/includes/function_products.php
	dealer-inventory.php
	dealers.php
	design/css/oar-style.css
	design/css/style.css
	design/images/designer-profile-img.jpg
	design/images/products/dealer-logo.jpg
	design/includes/dealer-inventory-page.php
	design/includes/dealer-login-inner-page.php
	design/includes/dealer-profile-inner-page.php
	design/includes/dealers-inner-page.php
	design/includes/footer.php
	design/includes/head.php
	design/includes/home-page-content.php
	design/includes/product-details-inner-page.php
	design/includes/store-inner-page.php
	design/includes/user-login-inner-page.php
	images/dealers/Chrysanthemum.jpg
	images/dealers/Hydrangeas.jpg
	images/dealers/Hydrangeas_1.jpg
	index.php
	product-details.php

Signed-off-by: Yedukondalu88 <edukondalu@vegaatechnologies.com>