cleaning up main.js
Merge branch 'master' of https://github.com/jsnowdon/3750