exercise in conflict
fix conflict
Merge branch 'master' of github.com:gagolews/dsrtest