Merge pull request #24 from Ricecoder/journal-week-5

Final draft

Author: Ricecoder

journal-week-5.md

@@ -8,8 +8,10 @@ At a restaurant a waiter (API) allows a diner (you/the user making the request f
 
 This is a very simple explaination but it gets the basic idea across.
 
-FOR TOMORROW: JSON FILES
+Now what format is that data most likely going to take? [JSON: JavaScript Object Notation](http://www.json.org/). These collect and present data in an orderly and easy to read format. They mostly consist of an object (dictionary) that is often contained in an array (list). The data is collected in key/value pairs which is universally recognized by most programming languages. JavaScript, or another programming language, is then used to write code that parses through the data.  
+
+
+
 
-FOR THE NEXT DAY: IIFES AND SCOPE
 
 

resource-week-5.md

@@ -9,4 +9,9 @@ The image will:
 * Not cause scrollbars
 * Use only CSS and not Flash to accomplish this.
 
+Using the CSS3 the article demonstrates how by using the `html` tag as opposed to the `body` tag we know that the image will always display at least the height of the browser window. Using  the `background-size` property set to `cover` we can further adjust the size.
+
+There are also alternate versions for accomplishing the same thing through different CSS and HTML methods.
+
+
 (https://css-tricks.com/perfect-full-page-background-image/)

tutorial-week-5.md

@@ -41,14 +41,17 @@ Changes not staged for commit:
 ```
 4.) Now you can simply `git add`, `git commit`, and `git push`.
 
+###Extras:
 
+* You can `stash` more than one time. Each stash will be added to a `stash list`. You can view this list with `git stash list`
+```
+$ git stash list
+stash@{0}: WIP on branch: 036h37 added files
+stash@{1}: WIP on branch: 048gy35 added more files
+```
+To access the stash you just added simply do `git stash apply` but to access a previous stash `git stash apply stash@{#}` where `#` represents the number of the stash you want. 
 
 
 
 
-
-
-FOR TOMORROW:
-* a few different synarios 
-
 https://git-scm.com/book/en/v1/Git-Tools-Stashing