Merge pull request #1 from gctucker/merge-test

edit HEY

This is the merge from the pull request...
another change