merge with new remote.
Merge branch 'master' of https://github.com/townsenr17/cs376Proj