Tada
Merge pull request #3 from urfolomeus/patch-1

Tada
link to travis
Update Gemfile
commit the lock, oops
Merge branch 'master' of https://github.com/indirect/oss-contribution

Conflicts:
	README.md
Fix failing test

I don't like failing tests