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)
* working:
  week1 typo, thanks Kyle


Trivial merge