Commit the git file
Merge branch 'master' of https://github.com/garciah16/cs376Proj