Add Adam's name to the assignment (to cause a merge conflict)
Added my first name to index.html
Fixing merge conflict