Cleaning JavaScript
Merge branch 'master' of github.com:leesdolphin/DECO1800
Merged changes.