Changing title of HTML file
Adding copyright notice
Adding copyright notice to Readme
Merge branch 'add-copyright'
Adding team member to humans.txt
Adding instructions on how to contribute
Merging changes from simple-changes branch
Making changes to simple.html
Adding conflicting changes (on purpose)
for Git example. I hope this work!
Done resolving merge conflicts
updating ignore file to exclude merge temp files