Removed conflicts from frontend/views/home.php
Merge pull request #2 from priyanka-techmaes/homepage

Removed conflicts from frontend/views/home.php
Removed conflicts from home.php