Added merge file
change merging
more changes
Merge pull request #5 from johnwfoley/test

Test