01 kai test

.github/ISSUE_TEMPLATE/another-tech-lead.md

@@ -0,0 +1,24 @@
+---
+name: Another Tech Lead
+about: Create a new issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Description
+Create a merge conflict for me!
+
+Acceptance Criteria
+
+
+Follow steps in Part 2 (clone my repo, create your branch)
+
+In the home page, contribute some code.
+
+Push your branch to develop. Hopefully this forces a merge conflict!
+Note: You may have to clone an earlier version of this repository to force the merge conflict. See if you can do it! You may need to contact me :)
+
+Additional Information
+Include a screenshot of your page

src/app/page.tsx

@@ -6,22 +6,21 @@ export default function Home() {
       <div className={styles.container}>
         <img src="https://media.licdn.com/dms/image/v2/D5603AQFcya7jebNo2g/profile-displayphoto-shrink_200_200/profile-displayphoto-shrink_200_200/0/1724012519952?e=2147483647&v=beta&t=eTR6xwLbsXt6cUCogxfQUG1pujj0Gub6ns2h_sl4aXI" alt="Ryan Agdassi" className={styles.profilePic} />
 
-        <h1 className={styles.name}>Ryan Agdassi</h1>
-        <h2 className={styles.title}>Tech Advisor at Hack4Impact-Cal Poly</h2>
+        <h1 className={styles.name}>Kailuan Liu</h1>
+        <h2 className={styles.title}>Tech Lead at Hack4Impact-Cal Poly</h2>
 
         <section className={styles.section}>
           <h3 className={styles.sectionTitle}>About Me</h3>
           <p className={styles.about}>
-            Ryan Agdassi is a computer science student at California Polytechnic State University - San Luis Obispo. 
+            Kai is a computer science student at California Polytechnic State University - San Luis Obispo. 
           </p>
         </section>
 
         <section className={styles.section}>
           <h3 className={styles.sectionTitle}>Experience</h3>
           <ul className={styles.list}>
-            <li>Tech Advisor - Hack4Impact</li>
-            <li>Tech Lead - Hack4Impact, Go See Foundation</li>
-            <li>Software Developer - Hack4Impact, Partners in Equestrian Therapy</li>
+            <li>Tech Lead - Hack4Impact, MuchHope</li>
+            <li>Software Developer - Hack4Impact, Habitat For Humanity</li>
           </ul>
         </section>
 
@@ -31,7 +30,7 @@ export default function Home() {
             <li>JavaScript, TypeScript</li>
             <li>React, Next.js, Node.js</li>
             <li>Python, Java, C</li>
-            <li>MongoDB, PostgreSQL</li>
+            <li>MongoDB</li>
           </ul>
         </section>
       </div>