updated things a bit
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC