Added lib, spec, and guardfile
Fixing merge conflict in README