first commit on Mac
Merge branch 'master' of https://github.com/siriuxy/UW-CS351

I just want to merge it. I'm not sure what i am doing.