First commit in master branch
Changes made to text document in NewBranch1
Changes made to text document in Master
Merge branch 'NewBranch1'

Conflicts:
	New Text Document.txt
This is a commit message in notepad ++.
Change of the New Text Document yet again
Made another change to the text document.
It was an awesome change.
It really made the world a better place to live.
Merge branch 'master' of https://github.com/nebramall/GitTest