Merge remote-tracking branch 'origin/animacoes'

Conflicts:
index2.html
scripts/site.js
Merge
merge