This is a file with some text in it.

We will be demonstrating git using this file.

We will show how one can best resolve conflicts.

We will show how to do a rebase.

We will be showing a whole bunch of great features.