Cal camp
fixed merge conflict - Stanford won