Manually resolve #14
Should have been included in #16
Merge branch 'create_match'
Merge pull request #17 from bengladwell/master

Manually resolve @jennahines PR #14