Merged with new remote.
Merge branch 'master' of https://github.com/zozoviola/cs376Proj