Initial project
A: start working
A: incremental work
A: finish A
Merge branch 'a/dev' into integration

* a/dev:
  A: finish A
  A: incremental work
  A: start working
B: new table
B: continue work on my own
B: make bug
B: ready to test
Merge branch 'c/bug' into b/dev

Merge, fixing Charlie's bug.  We might normally ask him to fix himself.

* c/bug:
  B: make bug

Conflicts:
	b
Merge branch 'b/dev' into integration

Merge completed bug-free feature.

* b/dev:
  B: ready to test
  B: make bug
  B: continue work on my own
  B: new table
Merge https://github.com/jedbrown/git-tutorial into attendees

I'm at the Git tutorial