Making two changes
Merge branch 'master' of github.com:mit-social-computing/group-documents

Conflicts:
	shipping.md