/Tutorial4

Conflict Part 2 from local

In this tutorial we are learning to create and merge branches as well as including the untracked files into our local repo.

This line if from feature branch.