names.txt
Merge branch 'master' of https://github.com/sarahsupp/nyu-swc-r

Conflicts:
	names.txt
Merge branch 'master' of https://github.com/sarahsupp/nyu-swc-r