Team Jimmy, Joey, and Alex

.gitignore

@@ -1 +1,2 @@
-__pycache__/
+__pycache__/
+.venv/

README.md

@@ -21,7 +21,7 @@ This repo serves as an activity for students to practice the common git workflow
 
 After creating your fork of this repository, add an upstream link to the original repo. 
 
-```git remote add upstream https://github.com/computingtalent/GitWorkflowIntro.git```
+```git remote add upstream https://github.com/CTI-CodeDay/GitWorkflowIntro.git```
 
 Create your own feature branch where you will commit your changes
 
@@ -36,6 +36,6 @@ Frequently pull the latest changes from the main branch.
 git checkout main
 git pull upstream main
 git checkout <your_branch_name>
-git rebase main
+git merge main
 ```