Updating to add custom values in
Merge branch 'master' of https://github.com/rmtmckenzie/cscw-icebreaker