Merge pull request #1 from mcelaney/master

Added a file
Added a file to test this thing
Changed a file