new commit with a file

described as all hell here
Merge pull request #12 from steeftee/062314branch

new commit with a file confirming merge