effed around in main.js
Merge pull request #4 from MSchip/feature-branch

effed around in main.js