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