Added Login
Resolve Conflicts
Edited : routes.php
Conflict Resolved