added images, changed css for homepage, dashboard and got rid of templates for cards and made them take actual local variables

app/globals.css

@@ -1,32 +1,3 @@
-<<<<<<< HEAD
-=======
-/* @import "tailwindcss";
-
-:root {
-  --background: #ffffff;
-  --foreground: #171717;
-}
-
-:root {
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --font-sans: var(--font-geist-sans);
-  --font-mono: var(--font-geist-mono);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --background: #0a0a0a;
-    --foreground: #ededed;
-  }
-}
-
-body {
-  background: var(--background);
-  color: var(--foreground);
-  font-family: Arial, Helvetica, sans-serif;
-} */
-/* 1. Import BOTH fonts in one go */
 @import url('https://fonts.googleapis.com/css2?family=Concert+One&family=Pixelify+Sans:wght@400;700&display=swap');
 @import "tailwindcss";
 
@@ -41,15 +12,9 @@ body {
 
   /* 3. Assign fonts to Tailwind's theme */
 
-<<<<<<< HEAD
-  /* Tell Tailwind to use the variables already defined in app/layout.tsx */
-  --font-sans: var(--font-sans);
-  --font-header: var(--font-header);
-=======
   /* --font-sans is for regular text (Concert One) */
   --font-sans: var(--font-concert-one);
   --font-header: var(--font-pixelify);
->>>>>>> 44b5a4dc49ea757e9790ba8309edc6b37d764105
 
   --font-mono: var(--font-geist-mono);
 }