commiting for merg
Merge branch 'master' of github.com:uscacm/Team7_FallHackSC
splash page