Add some stuff
Ignore foo.txt
Some random changes
Add some outline changes
Another change
Some other developer's commit
Make 1-2-3-4 changes
Add more changes
Vanessa's work
Merge branch 'feature-new' of github-r7:rapid7/git-demo into feature-new
Bob's changes
Vanessa's changes
Merge branch 'feature-new' of github-r7:rapid7/git-demo into feature-new

Conflicts:
	README.md
More changes from Bob
More changes from Vanessa
Add a workflow document to the demo repo

Because Leo told me and and it is awesome

GES-1396
Merge pull request #1 from rapid7/GES-1396-my-new-feature

Ges 1396 my new feature