my second change
Merge pull request #3 from cassiemc/branchtwo

my second change