Changing readme1 on the title-change branch
Adding some copyright notice
Merge branch 'add-copyright'
Adding some sample changes for the sample changes branch
Adding new instructiosn for the README.md file
Merging changes from simple changes branch
Added some replacements for the readme1.md file
Adding some conflicting changes on purpose for git example.
Done resolving merge conflicts
updating ignore file to exclude temp files from merge conflict