updated routes.php and home controller
Resolve Merge Conflicts