Update README
Merge pull request #3 from rails-decal/update-readme

Update README
Resolve merge conflicts