Alphabetized by first names.
Merge pull request #30 from jallentucker/another-branch

Alphabetized by first names.
fixed merge conflict