Merge branch 'main' of https://github.com/PdxCodeGuild/class_HB2 into kelin-lab03-number-to-phrases

Author: rayk472

0 General/10 GitHub Pull Request.md

@@ -15,6 +15,9 @@
 1. Verify the 'Comparing changes' is set to compare your lab branch with 'base: main':  
 ![04_verify_comparing_changes](https://user-images.githubusercontent.com/47562501/175929257-e582d9ba-61bc-4b02-aa93-eab9e8d1ead3.png)
 
+1. Verify that the only file changes included in Pull Request are for the lab designated in branch name:  
+![04 5_verify_only_appropriate_labs_have_changed](https://user-images.githubusercontent.com/47562501/178146015-f3bb66b1-a19d-4fc8-b612-0054d408aa64.png)
+
 1. Click 'Create pull request' button:  
 ![05_click_create_pull_request](https://user-images.githubusercontent.com/47562501/175929274-627d1818-fe98-4c56-8715-8f7407807f01.png)
 

0 General/11 Git Lab Workflow.md

@@ -1,6 +1,6 @@
 # Git Lab Workflow
 
-## The below is an example of workflow for creating branches for each new lab.
+## Create a new branch for each new lab.
 
 * Replace the `<new-branch-name>` items below with your appropriate formed `<studentdirectoryname-labnumber-lab-name>` branch name.
 * An example `<new-branch-name>` would be `bruce-lab01-python-exercise`
@@ -68,7 +68,7 @@
 
 1. Repeat process for new labs.
 
-## Use the following to switch between multiple in-process lab branches.
+## Switch between in-progress branches.
 
 1. Git `add` and `commit` changes to current branch:  
     1. `git add -A`
@@ -88,7 +88,7 @@
 
 1. Repeat process as needed.
 
-## Use the following to delete branches for labs which have already been graded.
+## Delete branches for labs which have already been graded.
 * NOTE: We delete the branches after they have been merged into `main` since the work has been completed and all the changes have been recorded in the `commit`s. We no longer need the branches.
 
 1. Sync our local record of remote branches. This will remove local references to branches which have been deleted on remote:  

1 Python/labs/02 Unit Converter

@@ -2,7 +2,8 @@ Lab 02: Unit Converter
 This lab will involve writing a program that allows the user to convert a number between units.
 
 Version 1
-Ask the user for the number of feet, and print out the equivalent distance in meters. Hint: 1 ft is 0.3048 m. So we can get the output in meters by multiplying the input distance by 0.3048. Below is some sample input/output.
+Ask the user for the number of feet, and print out the equivalent distance in meters. Hint: 1 ft is 0.3048 m. So we can get the output in meters by multiplying 
+the input distance by 0.3048. Below is some sample input/output.
 
 > what is the distance in feet? 12
 > 12 ft is 3.6576 m
@@ -26,16 +27,19 @@ Add support for yards, and inches.
 Version 4 - optional
 Now we'll ask the user for the distance, the starting units, and the units to convert to.
 
-You can think of the values for the conversions as elements in a matrix, where the rows will be the units you're converting from, and the columns will be the units you're converting to. Along the horizontal, the values will be 1 (1 meter is 1 meter, 1 foot is 1 foot, etc).
+You can think of the values for the conversions as elements in a matrix, where the rows will be the units you're converting from, and the columns will be the 
+units you're converting to. Along the horizontal, the values will be 1 (1 meter is 1 meter, 1 foot is 1 foot, etc).
 
 ft	mi	m	km
 ft	1		0.3048	
 mi		1	1609.34	
 m	1/0.3048	1/1609.34	1	1/1000
 km			1000	1
-But instead of filling out that matrix, and checking for each pair of units (if from_units == 'mi' and to_units == 'km'), we can just convert any unit to meters, then convert the distance in meters to any other unit.
+But instead of filling out that matrix, and checking for each pair of units (if from_units == 'mi' and to_units == 'km'), we can just convert any unit to meters, 
+then convert the distance in meters to any other unit.
 
-Furthermore you can convert them from meters by dividing a distance (in meters) by those same values used above. So first convert from the input units to meters, then convert from meters to the output units.
+Furthermore you can convert them from meters by dividing a distance (in meters) by those same values used above. So first convert from the input units to meters, 
+then convert from meters to the output units.
 
 Below is some sample input/output: