somethings get updated?
changed proj1 to read tokens in one at a time, updated hw5
fixed merge