try fix merge conflict

Author: DanielD6464

.gitignore

@@ -1,5 +1,6 @@
 # Ignore any user's VSCode workspace file
 *code-workspace
+.VSCode
 
 # Created by https://www.toptal.com/developers/gitignore/api/python,windows,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,windows,macos

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`
@@ -22,8 +22,17 @@
 
 1. Do some code changes.
 
-1. Add all the changes made to git tracking (or add only `<filename>` or `<directoryname>` changes):  
-    `git add -A`
+1. Use `git status` to view what files and directories have been changed:  
+    `git status`
+
+1. Use whichever or these four options is appropriate to add the necessary files to git tracking:  
+    `git add .`  
+    `git add <filepath>`  
+    `git add <directorypath>`  
+    `git add -A`  
+
+1. Use `git status` to view what files and directories will be added to the commit:  
+    `git status`
 
 1. Commit the changes made to the branch:  
     `git commit -m <commit message>`
@@ -33,8 +42,17 @@
 
 1. Do some more code changes.
 
-1. Add all the changes made to git tracking:  
-    `git add -A`
+1. Use `git status` to view what files and directories have been changed:  
+    `git status`
+
+1. Use whichever or these four options is appropriate to add the necessary files to git tracking:  
+    `git add .`  
+    `git add <filepath>`  
+    `git add <directorypath>`  
+    `git add -A`  
+
+1. Use `git status` to view what files and directories will be added to the commit:  
+    `git status`
 
 1. Commit the changes made to the branch:  
     `git commit -m <commit message>`
@@ -50,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`
@@ -70,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/01 Average Numbers renamed to 1 Python/labs/01 Average Numbers.md

@@ -1,31 +1,45 @@
-Lab 01: Average Numbers
+# Lab 01: Average Numbers
+
+## Version 1
 
 We're going to average a list of numbers. Start with the following list, iterate through it, keeping a 'running sum', then divide that sum by the number of elements in that list. Remember len will give you the length of a list.
 
 The code below shows how to loop through an array, and prints the elements one at a time.
 
+```python
 nums = [5, 0, 8, 3, 4, 1, 6]
+```
+
+### loop over the elements
 
-# loop over the elements
+```python
 for num in nums:
     print(num)
+```
+
+### loop over the indices
 
-# loop over the indices
+```python
 for i in range(len(nums)):
     print(nums[i])
+```
 
-Version 2
+## Version 2
 
 Ask the user to enter the numbers one at a time, putting them into a list. If the user enters 'done', then calculate and display the average. The following code demonstrates how to add an element to the end of a list.
 
+```python
 nums = []
 nums.append(5)
 print(nums)
+```
 
 Below is an example input/output:
 
+```log
 > enter a number, or 'done': 5
 > enter a number, or 'done': 3
 > enter a number, or 'done': 4
 > enter a number, or 'done': done
-average: 4
+> average: 4
+```

1 Python/labs/02 Unit Converter renamed to 1 Python/labs/02 Unit Converter.md

@@ -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:
 

1 Python/labs/03 Number To Phrases

@@ -0,0 +1,31 @@
+# Lab 3: Number to Phrase
+
+## Version 1
+
+- Convert a given number into its english representation.
+
+### For example: 67 becomes 'sixty-seven'.
+
+- Handle numbers from 0-99
+
+### Hint: you can use modulus to extract the ones and tens digit
+
+```python
+x = 67
+tens_digit = x // 10
+ones_digit = x % 10
+```
+
+### Hint 2: use the digit as an index for a list of strings OR as a key for a dict of digit:phrase pairs.
+
+## Version 2
+
+- Handle numbers from 100-999.
+
+## Version 3 (optional)
+
+- Convert a number to roman numerals.
+
+## Version 4 (optional)
+
+- Convert a time given in hours and minutes to a phrase.

1 Python/labs/03 Number To Phrases.md

@@ -0,0 +1,31 @@
+# Blackjack Advice
+
+Let's write a python program to give basic blackjack playing advice during a game by asking the player for cards. First, ask the user for three playing cards (A, 2, 3, 4, 5, 6, 7, 8, 9, 10, J, Q, or K). Then, figure out the point value of each card individually. Number cards are worth their number, all face cards are worth 10. At this point, assume aces are worth 1. Use the following rules to determine the advice:
+
+- Less than 17, advise to "Hit"
+- Greater than or equal to 17, but less than 21, advise to "Stay"
+- Exactly 21, advise "Blackjack!"
+- Over 21, advise "Already Busted"
+
+Print out the current total point value and the advice.
+
+```
+What's your first card? Q
+What's your second card? 2
+What's your third card? 3
+15 Hit
+
+What's your first card? K
+What's your second card? 5
+What's your third card? 5
+20 Stay
+
+What's your first card? Q
+What's your second card? J
+What's your third card? A
+21 Blackjack!
+```
+
+## Version 2 (optional)
+
+Aces can be worth 11 if they won't put the total point value of both cards over 21. Remember that you can have multiple aces in a hand. Try generating a list of all possible hand values by doubling the number of values in the output whenever you encounter an ace. For one half, add 1, for the other, add 11. This ensures if you have multiple aces that you account for the full range of possible values.

1 Python/labs/04 Black Jack Advice.md

@@ -0,0 +1,35 @@
+# Pick6
+
+Have the computer play pick6 many times and determine net balance.
+
+Initially the program will pick 6 random numbers as the 'winner'. Then try playing pick6 100,000 times, with the ticket cost and payoff below.
+
+A ticket contains 6 numbers, 1 to 99, and the number of matches between the ticket and the winning numbers determines the payoff. Order matters, if the winning numbers are `[5, 10]` and your ticket numbers are `[10, 5]` you have **0** matches. If the winning numbers are `[5, 10, 2]` and your ticket numbers are `[10, 5, 2]`, you have **1** match. Calculate your net winnings (the sum of all expenses and earnings).
+
+- a ticket costs $2
+- if 1 number matches, you win $4
+- if 2 numbers match, you win $7
+- if 3 numbers match, you win $100
+- if 4 numbers match, you win $50,000
+- if 5 numbers match, you win $1,000,000
+- if 6 numbers match, you win $25,000,000
+
+Write the following functions and use them in the code:
+
+- `pick6()`: Generate a list of 6 random numbers, which can then be used for both the winning numbers and tickets. Return the list
+- `num_matches(winning, ticket)`: Return the number of matches between the winning numbers and the ticket.
+
+## Steps
+
+1. Generate a list of 6 random numbers representing the winning tickets
+2. Start your balance at 0
+3. Loop 100,000 times, for each loop:
+4. Generate a list of 6 random numbers representing the ticket
+5. Subtract 2 from your balance (you bought a ticket)
+6. Find how many numbers match
+7. Add to your balance the winnings from your matches
+8. After the loop, print the final balance
+
+## Version 2
+
+The ROI (return on investment) is defined as `(earnings - expenses)/expenses`. Calculate your ROI, print it out along with your earnings and expenses.

1 Python/labs/05 Pick6.md

@@ -0,0 +1,26 @@
+Lab 06: Make Change
+
+Let's convert a dollar amount into a number of coins. The input will be the total amount, the output will be the number of quarters, dimes, nickles, and pennies. 
+Always break the total into the highest coin value first, resulting in the fewest amount of coins. For this, you'll have to use floor division //, 
+which throws away the remainder. 10/3 is 3.333333, 10//3 is 3.
+
+Welcome to the Change Maker 5000 (tm)
+Enter a dollar amount: 1.36
+5 quarters, 1 dime, and 1 penny
+Would you like make more change? yes
+Enter a dollar amount: 0.67
+2 quarters, 1 dime, 1 nickel, 2 pennies
+Would you like make more change? no
+Have a good day!
+
+Version 2 (optional)
+
+Instead of hard-coding the coins, store them in a list of tuples. This way you can make custom coins.
+
+coins = [
+    ('half-dollar', 50),
+    ('quarter', 25),
+    ('dime', 10),
+    ('nickel', 5),
+    ('penny', 1)
+]