where i test things with git
test1 is seeing what happens when you pull the master branch into the dev branch
now we move ahead of the master branch
now i add a little in the master branch, and a second commit
this is the merge commit
and now i add some that should be brought back into the main master branch