Fixing conflict in gemspec
Merge pull request #7 from darbyfrey/gemspec_conflict

Fixing conflict in gemspec