updated to fix merge conflicts

content/assignments/_index.md

@@ -1,20 +1,18 @@
 ---
 title: "Assignments"
-date: 2023-01-11T13:14:59-06:00
+date: 2023-05-22T10:20:54-05:00
 draft: false
 weight: 100
-originalAuthor: John Woolbright # to be set by page creator
-originalAuthorGitHub: jwoolbright23 # to be set by page creator
-reviewer: Kimberly Horan # to be set by the page reviewer
-reviewerGitHub: codinglikeagirl42 # to be set by the page reviewer
-lastEditor: John Woolbright # update any time edits are made after review
-lastEditorGitHub: jwoolbright23 # update any time edits are made after review
-lastMod: 2023-02-07  # UPDATE ANY TIME CHANGES ARE MADE
+originalAuthor: <no value> # to be set by page creator
+originalAuthorGitHub: <no value> # to be set by page creator
+reviewer: # to be set by the page reviewer
+reviewerGitHub: # to be set by the page reviewer
+lastEditor: # update any time edits are made after review
+lastEditorGitHub: # update any time edits are made after review
+lastMod: # UPDATE ANY TIME CHANGES ARE MADE
 ---
 
-## What is a Graded Assignment?
-
-Graded Assignments will count towards your final grade in the course. Each assignment is graded pass-fail. While Assignment 0 is more of a tutorial to get you used to autograding in Java, you have to get a passing grade on the four TechJobs assignments in order for you to continue on to the next unit. Each assignment builds on concepts introduced over multiple lessons, so we encourage you to begin reviewing the assignment and working on the different tasks as soon as the assignment becomes available in Canvas.
+## Major Concepts & Key Terminology
 
 ## Content Links
 

content/assignments/next-steps.md

@@ -1,17 +1,15 @@
 ---
 title: "Next Steps"
-date: 2023-01-11T13:14:59-06:00
+date: 2023-05-22T10:20:54-05:00
 draft: false
-weight: 6
-originalAuthor: Courtney Frey # to be set by page creator
-originalAuthorGitHub: speudusa # to be set by page creator
-reviewer: Kimberly Horan # to be set by the page reviewer
-reviewerGitHub: codinglikeagirl42 # to be set by the page reviewer
-lastEditor: Courtney Frey # update any time edits are made after review
-lastEditorGitHub: speudusa # update any time edits are made after review
-lastMod: 2023-02-07  # UPDATE ANY TIME CHANGES ARE MADE
+weight: 4
+originalAuthor: <no value> # to be set by page creator
+originalAuthorGitHub: <no value> # to be set by page creator
+reviewer: # to be set by the page reviewer
+reviewerGitHub: # to be set by the page reviewer
+lastEditor: # update any time edits are made after review
+lastEditorGitHub: # update any time edits are made after review
+lastMod: # UPDATE ANY TIME CHANGES ARE MADE
 ---
 
 ## Next Steps
-
-After completing the assignments for this course, you will be ready to make your own project as part of the next unit. The next unit focuses on interviewing, resumes, and how you can expand upon the skills you learned throughout the first two units to build a personal project to share with potential employers.