My cool new file
added new test
Merge pull request #13 from jsarmien/master

My cool new file