Merge branch 'working' into shared
authorJim <jim.pryor@nyu.edu>
Sun, 1 Feb 2015 20:50:19 +0000 (15:50 -0500)
committerJim <jim.pryor@nyu.edu>
Sun, 1 Feb 2015 20:50:19 +0000 (15:50 -0500)
commit79cec6a35353e38753e06837b4613b729dce9e8c
treeb192ece5e0d26daa649ff2c991ee1a74fcf4096c
parentd7dd23c2ace59bf557f247e57fe75190a4d1e798
parent8f3ef33f3f9bc089b5590f660517977b1b3c0972
Merge branch 'working' into shared

* working:
  week1 typo, thanks Kyle