Update scripts.js

- manual merge