Update index.html
Update index.html
Edit conflicts.
Merge remote-tracking branch 'origin'
Update index.html
onflict with files.
Merge remote-tracking branch 'origin'
Update index.html
Conflict with edited files again
Merge branch 'master' of https://github.com/ivondrq/Spoon-Knife
Merge pull request #1 from ivondrq/master

Something Heading the currently pull request