resolve conflicts

Author: brianamarie

config.yml

@@ -106,7 +106,7 @@ steps:
         filename: _config.yml
         action_id: file
       - type: gate
-        left: '/^theme:\s?minima$/m'
+        left: '/^theme:\s?jekyll-theme-minimal$/m'
         operator: test
         right: '%actions.file%'
         else:
@@ -118,6 +118,7 @@ steps:
         body: 04_create-blog-post.md
         data:
           branch: '%payload.pull_request.head.ref%'
+          date: '%payload.pull_request.created_at%'
 
   - title: Create a blog post
     description: Create a new file that will become your first blog post.

responses/00_class-introduction-issue.md

@@ -2,7 +2,7 @@
 
 Welcome to GitHub Pages and Jekyll :tada:!
 
-In this course, you'll learn how to build and host a [GitHub Pages](https://pages.github.com) site. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content you’d like.
+If you're new to GitHub Pages, or you want to learn how to build and host a [GitHub Pages](https://pages.github.com) site, you're in the right place. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content you’d like.
 
 In this course, you'll create a blog hosted on GitHub Pages and learn how to:
 

responses/03_change-theme.md

@@ -10,13 +10,17 @@ You can check out the `_config.yml` file on the **Code** tab of your repository.
 
 ### :keyboard: Activity: Modify the config file
 
-Let's change the `_config.yml` so it's a perfect fit for your new blog. First, we need to use a blog-ready theme. For this activity, we will use a theme named `minima`.
-
-1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file
-1. In the upper right corner, click :pencil2: to open the file editor
-1. Change `theme:` to **minima** and modify the other configuration variables such as `title:`, `author:`, and `description:` to customize your site
-1. Click **Create a new branch for this commit and start a pull request**
-1. Open a pull request
+Let's change the `_config.yml` so it's a perfect fit for your new blog. First, we need to use a blog-ready theme. For this activity, we will use a theme named `jekyll-theme-minimal`.
+
+1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file, or click this link [here]({{ repoUrl }}/blob/master/_config.yml).
+2. In the upper right corner, click :pencil2: to open the file editor.
+3. Change `theme:` to **jekyll-theme-minimal** so it shows in the `_config.yml` file as below:
+    ```
+    theme: jekyll-theme-minimal
+    ```
+4. Modify the other configuration variables such as `title:`, `author:`, and `description:` to customize your site.
+5. Click **Create a new branch for this commit and start a pull request**.
+6. Open a pull request.
 
 <hr>
 <h3 align="center">Look for my next response in your pull request.</h3>

responses/04_create-blog-post.md

@@ -6,9 +6,12 @@ This pull request looks great so far. :sparkles: You've just edited the `_config
 
 ### :keyboard: Activity: Add some content to your blog
 
+**Shortcut Note**: Click this link [here](https://github.com/{{ owner }}/{{ repo }}/new/{{ branch }}/?filename=_posts/{{ date | date: "%Y-%m-%d" }}-my-first-blog-post.md) to automatically complete steps 1-4.
+
 1. On the "Code" tab, select your `{{ branch }}` branch
 1. Click **Create new file**
-1. Name the file `_posts/YYYY-MM-DD-title.md`, but replace the `YYYY-MM-DD` with today's date, and `title` with the title you'd like to use for your first blog post
+1. Name the file `_posts/YYYY-MM-DD-title.md`
+1. Replace the `YYYY-MM-DD` with today's date, and change the `title` of your first blog post if you'd like. _Note:_ If you do edit the title, make sure there are hyphens between your words.
 
    - If your blog post date doesn't follow the correct date convention, you'll receive an error and your site won't build. For more information, see "[Page build failed: Invalid post date](https://help.github.com/articles/page-build-failed-invalid-post-date/)".
 

responses/04_wrong-theme.md

@@ -1,11 +1,11 @@
-It looks like you changed your theme, but for this activity we want to use `minima`.
+It looks like you changed your theme, but for this activity we want to use `jekyll-theme-minimal`.
 
-### :keyboard: Activity: Change the theme to minima
+### :keyboard: Activity: Change the theme to jekyll-theme-cayman
 
 Let's change the theme to `minima`:
 
 1. At the top of this Pull Request, click the **Files changed** tab
-1. Click the :pencil2: icon to enter edit mode and change the  `theme:` to **minima**
+1. Click the :pencil2: icon to enter edit mode and change the  `theme:` to **jekyll-theme-minimal**
 1. Scroll to the bottom of the window to create a commit
 1. Enter a commit message then click **Commit changes**
 

responses/05_add-front-matter.md

@@ -11,9 +11,10 @@ date: 2019-01-20
 
 This example adds a title and date to your blog post. There are other useful things you could add here in the future like layouts, categories, or any other logic that is useful to you. For more information about configuring front matter, see the [Jekyll front matter documentation](https://jekyllrb.com/docs/frontmatter/).
 
-### :keyboard: Activity: Add Front Matter
+### :keyboard: Activity: Add Front Matter to your Blog Post
 
 1. Click the "Files Changed" tab in this pull request
+1. There are two files in the "Files Changed" tab, the `_config.yml` file and the `_posts/YYYY-MM-DD-title.md` file. Make sure to edit the file in the `_posts` folder. 
 1. Click on the pencil icon on the right side of the screen
 1. Type the following content at the top of your blog post:
 

responses/06_incorrect-front-matter.md

@@ -15,14 +15,15 @@ date: YYYY-MM-DD
 ---
 ```
 
-### :keyboard: Activity: Edit your file
+### :keyboard: Activity: Edit your blog post
 
 1. Click the "Files Changed" tab in this pull request
+1. Scroll past the config file, and find the file that you created
 1. Click on the pencil icon on the right side of the screen
 1. Make adjustments based on the above errors
 1. Scroll to the bottom, and commit your changes
 
 If you would like assistance troubleshooting the issue you are encountering, create a post on the [GitHub Community]({{ communityBoard }}) board. You might also want to search for your issue to see if other people have resolved it in the past.
 
 <hr>
-<h3 align="center">Watch below for my response.</h3>
+<h3 align="center">Watch below for my response.</h3>