fixed merge conflict in spec helper
Merge pull request #7 from binaryberry/master

fixed merge conflict in spec helper