Adds main.js file
Merge branch 'master' into sara-master
Merge pull request #2 from slkennedy/sara-master

Sara master