fixed a bug i created on accident on script.js
Merge branches 'sandra' and 'master'