final changes to main.js
Merge pull request #1 from wchamil/master

trying to get this straight