adding homework 3

[3William56]

Hi Nicole, adding all files from HW3.

[Borgaard]

Hey Peter, this pull request has some merge conflicts that prevent me from accepting it. I got your homework, though, so you're fine for now. We'll want to fix this asap, though.

You have 2 options:

• 1. Before or after class on Tuesday we can resolve this together, or
• 2. If you'd like to attempt fixing this on your own, I'll give you some direction:

These are the conflicting files:

Conflicting files
Maryam-Marjoori/homework_1/app.js
Maryam-Marjoori/homework_2/app.js
andres-andresjv/homework_1/arrays-exercise/app.js
dayana-Day-ana/.DS_Store
peter-3William56/homework1/.DS_Store

There's a difference between what your Github fork has remotely, and what you have locally (on your computer) with git, and the differences are specifically in those files. Github is asking you to choose what you want to keep.

To sync this, you'll need to add, commit, and pull down from the class homework repo, add, commit, then push everything back up.

• Navigate to your jsd5- homework directory (cd directoryHere)
• Check your remote (git remote -v) to see the nickname/variable for class repo. It's probably upstream, but that's just my guess.
• Do a git status to see if your directory is clean. If not, add and commit what you have.
• Once your directory is clean, git pull upstream master - this is what will sync what's on Github remotely, and on git locally.
• Check git's status once again, and if your directory is clean, push everything back up. If not, add, commit, and push.

This should resolve the merge conflict issue. :)

[Borgaard]

Excellent use of an IIFE! :)

[Borgaard]

You could just invoke the random1() and random2() functions you defined above on lines 20 and 26 😜

[Borgaard]

This is another great example of why scope is so important - you have two functions with identical names in the same file, but fortunately they do the same thing. What if they did something different? When you call random2(), which function would run?