Start new feature
Merge branch 'pure-sinatra' of github.com:danascheider/canto into pure-sinatra