<<<<<<< HEAD
Hello there.

hi hi hi
=======
Hi from Bert
Bert's changes on bertsfeature branch
>>>>>>> origin/master
This is a sample project students can use during Matthew's Git class.

We can have a bit of fun with this repo, knowing that we can always reset it to a known good state.  We can apply labels, and branch, then add new code and merge it in to the master branch.

As a quick reminder, this came from one of three locations in either SSH, Git, or HTTPS format:

* [email protected]:matthewmccullough/hellogitworld.git
* git://github.com/matthewmccullough/hellogitworld.git
* https://[email protected]/matthewmccullough/hellogitworld.git

We can, as an example effort, even modify this README and change it as if it were source code for the purposes of the class.

This demo also includes an image with changes on a branch for examination of image diff on GitHub.

Marks Change