added capybara requires
merge conflict mediation
Merge branch 'master' of https://github.com/michaelmuse/twendy
Merge branch 'master' of https://github.com/michaelmuse/twendy
Merge branch 'master' of https://github.com/michaelmuse/twendy
Merge branch 'master' of https://github.com/michaelmuse/twendy