fixes
Merge branch 'master' of github.com:uscacm/Team10_FallHackSC