Preparing to merge with Janet's changes to setup.js
resolved merge
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
reverting setup to just parsing to file, other random cleanup