first file changed
2nd commit from jeff
Merge pull request #3 from rdehler/jeff

Jeff's branch from story xyz