Merge branch 'master' into capybara
edited routes
Merge pull request #19 from arieldiamond/capybara

Capybara