added styling to the landing page
fix bugs
fix merge conflicts
fix merge conflicts