Scripts and stylesheets, etc.
Script changes
Resolution of the merge: index.html