added Derp
this fixes a merge conflict
Merge pull request #4 from slraypole1993/fix-something

added Derp