Testing for conflict in repo
Merge branch 'master' of github.com:PiotrZakrzewski/ns-web-roller