pulling own changes
merge conflicts what
Merge branch 'master' of github.com:rchen152/CS181
pulling bad ghost tracking
What did I mess up?
how about now