Fresh line

.gitignore

@@ -1 +1,2 @@
-*.zip
+*.zip
+private/*

README.md

@@ -1,43 +1,46 @@
 ❤️
 
 ***
-We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-02-08-friendly-github-intro) for the workshop here - Github Workshop, March 8th, 2016.
+We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop on July 22nd, 2016.
 ***
 
-# A Friendly Github Introduction
-This is a friendly introduction to making open, version-controlled, and collaborative projects using Github.
-
-You are invited to fork this repo and use our materials-- please let us know what you do with them and how it goes!
+# Beginners guide to version control with git
+This is a beginner friendly introduction to making open, version-controlled, and collaborative projects using git and GitHub.
 
 ## About
 
-This is a friendly introduction to Github – a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the Github ecosystem and help you get you comfortable navigating basic Github workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on Github (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how Github can help make your projects more readable and accessible. This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritized.
+**Description**: Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+
+Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
+This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
 
 ## Learning Objectives & Takeaways
 
 At the end of the workshop, we hope you will feel acquainted and/or comfortable with:
 
 * Github as:
-	* social platform - collaboration, coordination, and contributing
+	* Social platform - collaboration, coordination, and contributing
 	* Time machine - track project and go back	
-	* documentation & sharing platform
-	* project development platform
+	* Documentation & sharing platform
+	* Project development platform
 * Basic Github Workflows:
-	* working individually with commits, issues, branching, and merging
-	* working collaboratively with issues, forking & pull requests
-
-
+	* Working individually with commits, issues, branching, and merging using git
+	* Working collaboratively with issues, forking & pull requests
 
 ## Why are we teaching GitHub?
 
 Git/GitHub can enable projects of any size (from individuals up to organizations and companies) to develop in a way that is well managed, readable, and many cases, accessible and open source. GitHub is allowing professors to share their course materials online, scientists to share their analyses and data, startups to build new technologies, and governments to share data - it is enhancing our ability to do work, better. 
 
 At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects. 
 
-###What is "open" research?
-Whether you're studying the human genome, black holes, deep sea ecology, medieval music,  or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.  
+### What is "open" research?
+
+Whether you're studying the human genome, black holes, deep sea ecology, medieval music,  or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.
 
-###Oh, by the way, what's Mozilla Science Lab??
+### What's Mozilla Science Lab??
 At [Mozilla Science Lab](https://mozillascience.org/) we help scientists and researchers (anyone from students to established researchers to citizen scientists) to work openly and do better research, more research, and make that research more useful by sharing it widely.  
 
 We provide various types of trainings (such as this Workshop), learning materials and formats (such as [Mozilla Study Groups](http://mozillascience.github.io/studyGroupHandbook/)), platforms for sharing and showcasing open Science projects (such as [MSL Collaborate](https://mozillascience.org/collaborate)), and support for leaders in open science (through the [Mozilla Fellows for Science](https://mozillascience.org/fellows).

assets/css/style-dev.less

@@ -68,6 +68,7 @@ p, li {
 
 ul, ol {
   margin: 0 0 30px 0;
+  margin-left : 30px;
 
   li {
     margin-bottom: 6px;
@@ -78,6 +79,7 @@ ul {
   li {
     list-style-type: none;
     position: relative;
+    margin-left : 30px;
 
     &:before {
       content: ".";

assets/css/style.css

@@ -53,6 +53,7 @@ li {
 ul,
 ol {
   margin: 0 0 30px 0;
+  margin-left : 30px;
 }
 ul li,
 ol li {
@@ -431,4 +432,4 @@ article pre{
   color:black;
   padding: 10px;
   width:100%;
-}
+}

exercises/my-first-pullrequest/index.html

@@ -0,0 +1,248 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Exercise: My first pull request</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href='https://fonts.googleapis.com/css?family=Fira+Sans:400,400italic,500,500italic,700' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../assets/css/style.css">
+    <link rel="icon" type="image/ico" href="https://mozillascience.org/img/favicon.ico">
+    <script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="../../assets/javascript/script.js" type="text/javascript" charset="utf-8"></script>
+</head>
+
+<body>
+    <aside>
+        <div class="image">
+            <img src="../../assets/images/science-fox.svg">
+        </div>
+        <nav>
+            <a class="selected" href="#introduction">Introduction</a>
+            <a href="#step-by-step">Step-by-step</a>
+            <a href="#stretch-goal">Stretch goal</a>
+            <a href="#glossary">Glossary</a>
+        </nav>
+    </aside>
+    <article>
+        <div class="logo">
+            <a href="https://mozillascience.org" title="Mozilla Science Lab">
+                <img src="../../assets/images/science-lab-logo.svg" />
+            </a>
+        </div>
+        <h1>My first pull request</h1>
+        <div class="meta-information">
+            <p class="summary">
+                In this exercise we will add your GitHub username to the workshop repository using a pull request.</p>
+            <div class="details">
+                <time>15 to 30 minutes</time>
+                <p class="difficulty">Beginner - Intermediate</p>
+            </div>
+        </div>
+        <section class="presentation-details">
+            <section>
+                <h4>Format</h4>
+                <p>
+                    This is designed as an in-person, facilitated workshop with pairs of learners working together, or individually.
+                </p>
+            </section>
+            <section>
+                <h4>Target Audience</h4>
+                <p>
+                    People new to Git/GitHub looking for some practice with the workflow.
+                </p>
+            </section>
+            <section>
+                <h4>Materials</h4>
+                <ul>
+                    <li>An Internet connection to access the GitHub site</li>
+                </ul>
+            </section>
+        </section>
+        <h2 id="introduction">Introduction</h2>
+
+        <p>
+          GitHub is a web-based interface for version control, a way of keeping track of changes made to a collection of working documents. GitHub provides a structure and space for communicating about collaborative work on open projects.
+        </p>
+        <p>
+          This exercise walks you through adding your very first contribution to an open source collaborative project using Git/Github through the GitHub web interface.
+        </p>
+
+        <h3>The Brief</h3>
+
+        <p>
+          We want to know who's taking part in the workshop, so please add your name to the <a href=https://github.com/KirstieJane/friendly-github-intro/blob/master/humans.md>humans.md</a> file in the <a href=https://github.com/KirstieJane/friendly-github-intro/>friendly-github-intro</a> workshop repository.
+        </p>
+        <p>
+          You'll have to <strong>fork the repo</strong>, make a change to the <strong>humans.md</strong> file and <strong>commit</strong> it to your fork, and then make a <strong>pull request</strong> to ask the workshop facilitator to merge the edit.
+        </p>
+        <p>
+          If you have time, <strong>make an issue</strong> in your own repository suggesting a change that someone else could make and add a link to that issue to the <a href=https://github.com/KirstieJane/friendly-github-intro/issues/3>participant issue list</a> issue in the <a href=https://github.com/KirstieJane/friendly-github-intro/>friendly-github-intro</a> workshop repository. Then, either sit back and wait for someone to make that change for you, or go and see if you can help someone else move their project along.
+        </p>
+
+        <h2 id="step-by-step">My first pull request: Step by step</h2>
+        <ol class="steps">
+            <!-- Step 0 -->
+            <li>
+                <h1>Find the repo</h1>
+                <p>
+                    Follow this link: <a href=https://github.com/KirstieJane/friendly-github-intro target="_blank">https://github.com/KirstieJane/friendly-github-intro</a>
+                </p>
+
+                <img src="../../assets/images-slides/my-first-pr-find-repo.png" />
+
+            </li>
+
+            <li>
+                <h1>Sign in</h1>
+                <p>
+                    Log into your github account.
+                </p>
+
+                <img src="../../assets/images-slides/my-first-pr-login1.png" />
+                <img src="../../assets/images-slides/my-first-pr-login2.png" />
+            </li>
+            <li>
+                <h1>Fork the Repo</h1>
+                <p>
+                    Make a copy of the repository all of your own.
+                </p>
+                <img src="../../assets/images-slides/my-first-pr-fork1.png" />
+                <img src="../../assets/images-slides/my-first-pr-fork2.png" />
+            </li>
+            <li>
+                <h1>Find & open the humans.md file</h1>
+                <p>
+                    You're going to add your name to the humans.md file that lists all the contributors to this project.
+                </p>
+                <img src="../../assets/images-slides/my-first-pr-humans1.png" />
+                <img src="../../assets/images-slides/my-first-pr-humans2.png" />
+
+                <h3>HEADS UP: Common mistake!</h3>
+                <p>
+                    If you see the error below, you're trying to <strong>edit the original version</strong> of the repository, not your own fork!
+
+                    Go back to your home page by clicking on your avatar in the top right corner, click on your profiles, and you should see <strong>your own fork</strong> of the repository there!
+                </p>
+                <img src="../../assets/images-slides/my-first-pr-wrong-repo.png" />
+            </li>
+            <li>
+                <h1>Make a change & save the commit</h1>
+                <p>
+                    Change some of the information for one of the test participants to your own details.
+                    You might find this <a href=https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet>handy markdown guide</a> helpful.
+                <p>
+                <img src="../../assets/images-slides/my-first-pr-humans-edit.gif" />
+            </li>
+            <li>
+                <h1>Make a pull request</h1>
+                <p>
+                  Now you're ready to ask the project owner to merge in your changes.
+
+                  Click on the <strong>Pull Request</strong> tab and then on <strong>New Pull Request</strong>.
+                </p>
+                <img src="../../assets/images-slides/my-first-pr-new-pr1.png" />
+                <img src="../../assets/images-slides/my-first-pr-new-pr2.png" />
+            </li>
+
+            <li>
+                <h1>Wait for your pull request to be merged</h1>
+                <p>
+                  Keep an eye on your notifications to see if the project owner has any questions.
+                </p>
+                <p>
+                  If you've made a mistake, you might be asked to make further changes (but hopefully not!)
+                </p>
+                <p>
+                  If all goes well, <strong>CONGRATULATIONS!</strong> You've just made your first pull request and worked collaboratively on GitHub!
+                </p>
+            </li>
+        </ol>
+
+          <h2 id="stretch-goal">Stretch goal: Pull requests for other projects</h2>
+          <p>
+            Try asking other members of the workshop to help you. Create a new issue and add a link to the <a href=https://github.com/KirstieJane/friendly-github-intro/issues/3>participant issue list</a> issue in the <a href=https://github.com/KirstieJane/friendly-github-intro/>friendly-github-intro</a> workshop repository. Then, while you wait for another participant to help you fix the issue, take a look to see if there are any you can help with.
+          </p>
+
+          <p>
+            Use the <strong>social features</strong> of GitHub as much as you can. If the issue isn't clear, <strong>ask</strong> for clarification. Be polite and as clear as possible whether you're the project owner or the contributor.
+          </p>
+
+          <p>
+            Remember that to make a contribution to someone else's project you'll have to <strong>fork</strong> their repository so you have your own copy. Check <a href=https://kirstiejane.github.io/friendly-github-intro/exercises/my-first-pullrequest/>my first pull request</a> exercise if you need any help with those steps.
+          </p>
+
+        <h2 id="glossary">Glossary</h2>
+        <section class="glossary">
+            <section class="term">
+                <h3>repository, or repo</h3>
+                <p>
+                    a collection of documents related to your project, in which you create and save new code or content.
+                </p>
+            </section>
+            <section class="term">
+                <h3>markdown</h3>
+                <p>
+                    a lightweight way of annotating a document with instructions that tell a web browser how to format and display text.
+                </p>
+            </section>
+            <section class="term">
+                <h3>version control</h3>
+                <p>
+                    a way of tracking changes to a document or collection of documents. Version control is like a time machine, it can take you back to the moment your document was created, or any other point in time when you or a collaborator saved that document.
+                </p>
+            </section>
+            <section class="term">
+                <h3>Git</h3>
+                <p>
+                    the command-line software that tracks all changes to a collection of documents
+                </p>
+            </section>
+            <section class="term">
+                <h3>GitHub</h3>
+                <p>
+                    a service that hosts your repository online and helps you work with contributors. GitHub adds a web-based interface to version control.
+                </p>
+            </section>
+            <section class="term">
+                <h3>fork</h3>
+                <p>
+                    a copy of a repository that is saved in another user's GitHub account.
+                </p>
+            </section>
+            <section class="term">
+                <h3>branch</h3>
+                <p>
+                    a copy of a repo that is contained within the orignal repo. Branches are used to work on a project features without altering the original or "master" repo.
+                </p>
+            </section>
+            <section class="term">
+                <h3>commit</h3>
+                <p>
+                    a saved change to a document in a repository.
+                </p>
+            </section>
+            <section class="term">
+                <h3>issue</h3>
+                <p>
+                    a message on gitHub that outlines a task that needs to be completed.
+                </p>
+            </section>
+            <section class="term">
+                <h3>pull request</h3>
+                <p>
+                    a request to add a commit or collection of commits to a repository.
+                </p>
+            </section>
+            <section class="term">
+                <h3>merge</h3>
+                <p>
+                    the act of incorporating new changes (commits) into a repository.
+                </p>
+            </section>
+        </section>
+    </article>
+</body>
+
+</html>