3 resolving merge conflicts with GitHub forks 1

.github/ISSUE_TEMPLATE/completed-lists.md

@@ -2,7 +2,7 @@
 name: Completed Lists
 about: This is for your master pull request to merge your master into this repo.
 title: Put your UCID as the title (replace this text)
-labels: Compiled List
+labels: master list
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/things-i-don-t-understand.md

@@ -2,7 +2,7 @@
 name: Things I Don't Understand
 about: This is for adding issues that you don't understand
 title: ''
-labels: Things I Don't Understand
+labels: i don't understand
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/things-i-learned.md

@@ -2,7 +2,7 @@
 name: Things I learned
 about: Add one item for each thing you learned keep to max of 255 characters
 title: "[Things I Learned]"
-labels: Things I learned
+labels: i learned
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/things-i-want-to-know.md

@@ -1,8 +1,8 @@
 ---
 name: Things I want to know
-about: Describe this issue template's purpose here.
+about: Please describe what you want to know in less than 255 characters.
 title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
-labels: Things I learned
+labels: i want to know
 assignees: ''
 
 ---

README.md

@@ -11,19 +11,19 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
 
 ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned.  The number in the bracket next to each issue is the count, you should set your count at 1 for your issue.  We need the count of how many times the issue is mentioned, so that we can prioritze each issue.
 
-### Your list should look like this:
+### Our List:
 #### Things we understand**
-1.  Python Print[1]
-2.  Linux Directory listing[2] 
-3.  Docker Installation[1]
+1. Oracle Cloud Instance set-up[1]
+2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1]
+3. Basic BASH script commands (directory navigation, file creation, and text editing)[1]
 #### Things we don't understand
-1. Git Stash[1]
-2. GIt pull[2]
-3. GIT status[1]
+1. Resolving merge conflicts with GitHub forks[2]
+2. Web domain configuration[1] 
+3. VM and Docker configuration customization[1] 
 #### Things we want to know next**
-1.  Elastic Search Indexing [1]
-2.  Cloud deployment with Kubernetes[2]
-3.  Teraform[1]
+1. Host a website on Oracle Cloud from a GitHub repository[1] 
+2. Website content management[1] 
+3. Responsive web page design and development[1] 
 
 ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL
 Add your ssh public key to github - See video