olga's update
Merge branch 'master' of github.com:sarahsupp/nyu-swc-r