TODO Merge Soooooooooo Many Branches

[j-rewerts]

@1Shad0w @Jdvdb @ngergel (plaid guy, super TA, awesome person) @sichunx10 @Kkill77 @dalidia @soomyy @Patel-rutvik @nhtnhan @hanjun1 @a-majeed @nyg1 @b-stolte @weilinnnnnn @jenrenema @bchelle @BenjWagg @ccchoi2 @LambaShell @jayng11

You thought you were done??? NEVER! For any of you that are interested in getting merged into master (so your changes show up on the site), I'm going to add some steps in this issue on how to submit a pull request.

[j-rewerts]

For those of you that think Git is confusing, don't worry. It is. It'll come with practise!

[j-rewerts]

I'll be submitting a Pull Request from this branch, which was the branch that Noah and I made.

[j-rewerts]

First off, switch to the branch you want to merge into master.

[j-rewerts]

GitHub will show something like this above the files.

This tells us how many changes we're missing from the master branch, and how many changes we've added since branching off the master branch.

[j-rewerts]

There's an important button on the right side of that last picture.

Github's famous pull request!

This will create a pull request, which I will review before merging into master.

[j-rewerts]

Then your super cool changes will make it on our super awesome site!