Merge branch 'master' of github.com:proudsugar/sinatra-url-for
Merge branch 'master' into development