aggiunto testo a index
resolve merge conflict
added notes, completed coding
aggiorna gitignore

gitignore
aggiornamento file index

update index.html
Merge remote-tracking branch 'origin/r2_index'