added Grant Stampfli
fixed merge conflict
Merge pull request #31 from superiorperformer/alphabatize

added Grant Stampfli