Merge branch 'timtim17-master'
Hotfix for main.js

Fixed error and commented code a little better. Also changed the hide
preview option to use jquery
Merge pull request #3 from FRC-1294/master

Merge Changes