makersacademy · Delladi · Jun 20, 2016 · Jun 20, 2016 · Sep 20, 2016 · Sep 20, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,2 @@
+script:
+  - find ./ -name "jail.txt" | xargs less | $(command -v md5 || command -v md5sum) | grep -qif /dev/stdin encoded
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-The Command Line Murders
+The Command Line Murder
 ========================
 
     .OOOOOOOOOOOOOOO @@                                   @@ OOOOOOOOOOOOOOOO.
@@ -27,7 +27,7 @@ The Command Line Murders
 
 There's been a murder in Terminal City, and TCPD needs your help.
 
-Before you start, skim through the required materials in [Command Line chapter](https://github.com/makersacademy/pre_course/blob/master/command_line.md) and [Version Control Chapter](https://github.com/makersacademy/pre_course/blob/master/version_control.md). Use it as a reference while working through the case.
+Before you start, skim through the required materials in the Command Line and Version Control sections of the PreCourse on Teachable. Use it as a reference while working through the case.
 
 Now with your Terminal at hand you're ready to start. A couple of ground rules first:
 
@@ -46,11 +46,8 @@ Next you need to download those files to your machine so that you can edit them.
 
 ## Step 2: Investigate
 
-Each step of your investigation will contain a reference to the **Detective Handbook** at the top. Each page of the Detective Handbook contains the description of the commands you will need to complete that particular step. You can view them in the Terminal:
+Each step of your investigation will contain a reference to the **Detective Handbook** at the top. Each page of the Detective Handbook contains the description of the commands you will need to complete that particular step.
 
-```bash
-Reference: ./detective_handbook/getting_started.md
-```
 Open a Terminal, go to the location of the files (using the `cd` command), and start by reading the file 'step0'.
 
 One way you can do this is with following command:

diff --git a/detective_handbook/getting_started.md b/detective_handbook/getting_started.md
@@ -4,7 +4,7 @@
 
 Before we dive into using the command line, it's important to discuss the distinction between using a UNIX-based computer (Mac, any Linux including Ubuntu, etc.) or a PC running Windows. In these lessons, we're assuming you're using a Mac as it's the most common platform among web developers. With the technologies we cover at Makers – a Mac is the tool of choice. If absolutely required, you can use Ubuntu, but you may encounter minor problems along the way that we won't usually cover at Makers. This does not imply that Mac is somehow superior to Linux when it comes to web development. It is simply different, so the instructions provided for a Mac may not always work on a different system.
 
-If you don't have access to either a Mac or Linux machine you may find it easier to work with a cloud hosted solution such as [Nitrous](https://www.nitrous.io/).  This might run a little slower, but the Nitrous terminal is a good substitute and can be used from PCs and even Chromebooks.
+If you don't have access to either a Mac or Linux machine you may find it easier to work with a cloud hosted solution such as [C9](https://aws.amazon.com/cloud9/?origin=c9io).  This might run a little slower, but the C9 terminal is a good substitute and can be used from PCs and even Chromebooks.
 
 ## What is the command line?
 

diff --git a/detective_handbook/git.md b/detective_handbook/git.md
diff --git a/detective_handbook/step5.md b/detective_handbook/step5.md
@@ -1,9 +1,15 @@
 # `git branch`
 
-Branches in Git allow you to work on several different versions of your working directory at the same time. When you create a new branch and start tracking your changes they'll be saved only in this new branch. At any moment you can switch back to your original (e.g. "master") branch and all your files will be in the same state you left them before "branching out" regardless of the work you've done in the new branch.
+Branches in Git allow you to work on several different versions of your working directory at the same time. When you create a new branch and start tracking your changes they'll be saved only in this new branch. At any moment you can switch back to your original (e.g. "main") branch and all your files will be in the same state you left them before "branching out" regardless of the work you've done in the new branch.
 
-The `git branch` command allows you to see branches you have locally. To see all branches including remote ones type `git branch -a`.
+The `git branch` command allows you to see which branches you have locally. To see all branches including remote ones type `git branch -a`.
 
 # `git checkout`
 
-Use `git checkout BRANCH_NAME` to switch "active" or "current" branch. You can checkout to a new branch even if it's stored in the remote repository. When you do this the branch will be copied to your machine and will be set as "current" branch.
+Use `git checkout BRANCH_NAME` to switch "active" or "current" branch. You can checkout to a new branch even if it's stored in the remote repository. When you do this, the branch will be copied to your machine and will be set as "current" branch.
+
+# `git merge`
+
+`git merge` allows you to merge two branches together. E.g. if your current branch is "main" and you type `git merge more-cats` all the changes in the `more-cats` branch will be applied to the "main" branch and a new commit (merge commit) will be created.
+
+`git merge` will open your default command line text editor for you to confirm the merge commit message. Your default editor is likley to be Vim (you can check it by typing `echo $EDITOR`) see the PreCourse [section on Vim](https://makersacademy.teachable.com/courses/256825/lectures/3989204).
diff --git a/detective_handbook/step6.md b/detective_handbook/step6.md
@@ -8,8 +8,8 @@
 
 Use `man grep` to learn more about `grep` flags.
 
-# Making a pull request on Github
+# Making a pull request on GitHub
 
-You forked a repo, cloned it to your computer, made some changes committed and pushed them back to Github. Now if you want to submit those changes back to the original repo you would need to make a Pull Request. The maintainers of the original repo can review your changes and decide if they want to merge them.
+You forked a repo, cloned it to your computer, made some changes committed and pushed them back to GitHub. Now if you want to submit those changes back to the original repo you would need to make a pull request (PR). The maintainers of the original repo can review your changes and decide if they want to merge them.
 
-Refer to the [Github guide](https://help.github.com/articles/creating-a-pull-request/) to learn how to make a pull request.
+Refer to the [GitHub guide](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) to learn how to make a pull request.
diff --git a/hint2 b/hint2
diff --git a/step0 b/step0
@@ -26,6 +26,6 @@ Reference: ./detective_handbook/step0.md
 
 There's been a murder in Terminal City, and TCPD needs your help.
 
-All the materials needed to figure out who did it are in the 'mystery' subdirectory. Using the commands from the Detective Handbook take a look around to see what files are in the 'mystery' subdirectory.
+All the materials needed to figure out who did it are in the 'mystery' subdirectory. Perhaps consider opening another Terminal window (Cmd + N) to keep the various step instructions in one and navigating around and your commands in the other. Using the commands from the Detective Handbook take a look around to see what files are in the 'mystery' subdirectory.
 
 Once you answered the questions above, read the 'step1' file via your terminal to start collecting the clues.
diff --git a/step3 b/step3
@@ -4,13 +4,11 @@ You found 4 matches for the name 'Annabel'. Only 2 of them are women so you can
 
 ############ Challenge ###############
 
-See if you can find files matching street names for two remaining women named 'Annabel'. Use the combinations of commands from the Detective Handbook (section step3) to do this.
+See if you can find files matching street names for the two remaining women named 'Annabel'. Use the combinations of commands from the Detective Handbook (section step3) to do this.
 
 ######################################
 
 
-Take a look inside the files you've found. REMEMBER: among the information available in 'possible_witnesses.txt', you have references to line numbers. See if you can use that line number to discover something useful about the lady called 'Annabel'.
+Take a look inside the files you've found, they're big files, aren't they. REMEMBER: among the information available in 'possible_witnesses.txt', you have references to line numbers.
 
-If you get stuck check out hint2.
-
-Move on to step4.
+Move on to step4 to find the line we're looking for.
diff --git a/step6 b/step6
@@ -16,6 +16,8 @@ Now you need to search for multiple keywords in one file. How can you combine `g
 
 Save the list of suspects into a new file called 'suspects.txt', commit and push to Github.
 
-You're very happy with the progress of your investigation - you feel like you are close to identifying the culprit. Make a pull request to the original 'clmystery' repository to report your progress to The Chief.
+Make a pull request to the original 'makersacademy/clmystery' repository to report your progress to The Chief. Find out more about opening a pull request here: https://help.github.com/en/articles/creating-a-pull-request-from-a-fork
+
+You're very happy with the progress of your investigation - you feel like you are close to identifying the culprit.
 
 Move on to step 7.
diff --git a/step9 b/step9
@@ -6,6 +6,8 @@ To close the investigation and let the courts do their work, save his name in a
 
 Change permissions on the file so that you are the only one able to edit it (everyone else can read the contents). There was a case last summer where a convict was switched out for an innocent man on the way to jail - and we don't want that happening again!
 
+Make sure that 'jail.txt' contains only the name of the convict with no extra spaces! Don't copy-and-paste the name, type it in manually. This way our jailkeeper robot can check if you've caught the right guy.
+
 Add & commit 'jail.txt' and push to Github. You can now relax and wait for that promotion, Detective!