removed console.log from js file
Merge branch 'master' into john
Merge pull request #30 from jahoopes/master

merged changes