rmtmckenzie/cscw-icebreaker — pull request #22 by rmtmckenzie (2014-03-26 00:20:12+00:00)
Title: Catch morgan branch up to master

Merge changes to master into morgan branch.