updated README.md

[dcarty01]

No description provided.

[bmneely]

It looks like there is a merge conflict between your master branch and the upstream master. Another student changed the file, so your PR is now out of date. Don't worry, this is easy to fix (and a great thing to learn)!

If you haven't already, you'll need to add an upstream remote to your local repo. On your computer, in your fullstack-example-collaboration folder:

$ git remote add upstream https://github.com/Bloc/rails-web-dev-example-collaboration-repo

Then pull down the changes from upstream:

$ git pull upstream master

You might have to resolve merge conflicts between your changes and the upstream changes.

After you resolve the merge conflict, add, commit, and push your changes back up to your own repo (origin). This will automatically update the PR and it should be good to merge! Just write a comment mentioning @bmneely to let me know.

Good luck, if you have any questions, don't hesitate to reach out to me or your mentor!