critest

Testing of git merges:

1. Setup test repo with a couple of files/foldes
2. Create a 'small-fix' branch
3. Create a 'big-feature' branch
4. To the 'small-fix' branch:
   1. Make one or two small edits to a couple files
   2. Commit to branch and push to origin
   3. Merge into master
5. To the 'big-feature' branch:
   1. Make a change in one of the above changed files, but not in the same lines
   2. Commit to branch and push to origin
   3. Merge master into branch
   4. Merge branch into master
6. See if 'small-fix' changes are still in master