Updated funcitonality from branches to main branch

• Updated the App.js file of the project by resolving merge conflicts.
• Removed placeholder text and the unnecessary link was removed.
• Aligned the logo import variable name to match across the different branches.
• Squashed multiple commits together to ensure readability.
• Updated App.js to suite my own needs and show that I understood the needed changes.