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

Conflicts:
	design/css/oar-style.css
	design/includes/category-page.php
	design/includes/footer.php

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