found another missed merge conflict
normalizing space/tabs on file
Merge pull request #29 from jeremyBass/master

found another missed merge conflict