merged with new remote
Merge branch 'master' of https://github.com/bryanj17/cs376Proj

ommit.
'commit.'