Correct bad merge
Merge pull request #5 from jbbrokaw/shaneBranch

Correct bad merge