update
Merge branch 'rspec-testing' of https://github.com/wilchandler/exitslips into rspec-testing