todo o wykluczaniu
Merge branch 'master' into sinatra