gitmergeplay

Just a small repo to play with some of gits features. I made a change here

This was added by me and no one else... My own change :) This is another one...