README.md

getting-git

Demo repository for git presentations

Nathan's adding a line to the readme

Another change

Brien is making another change to the repo

Nathan is making changes. This might be a problem.

This is Brien's conflicting change