clear another merge conflict
Merge pull request #28 from jeremyBass/master

clear another merge conflict