Merge Update
script.js
Merge branch 'master' of https://github.com/shkidd/nrb

Conflicts: