before pull on Sat
before pull, after jenny push, add history
before pull, after jenny push, add history
2nd try
3nd try
blah
Merge branch 'master' of https://github.com/sarahhtn/CS108_final_project