test test
Merge branch 'master' of https://github.com/gagolews/dsrtest

Conflicts:
	slump.txt